Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
9a0d08d3
Commit
9a0d08d3
authored
6 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
contrib: update x264
Change-Id: Ieb79dbf8c6194178809066a8cde2cd32fac4aea9
parent
05d97091
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
contrib/src/x264/rules.mak
+2
-10
2 additions, 10 deletions
contrib/src/x264/rules.mak
with
2 additions
and
10 deletions
contrib/src/x264/rules.mak
+
2
−
10
View file @
9a0d08d3
# x264
# x264
ifndef
HAVE_IOS
ifndef
HAVE_IOS
X264_HASH
:=
8c2974255b01728d4eda2434cc1997c4a3ca5eff
X264_HASH
:=
5493be84cdccecee613236c31b1e3227681ce428
else
else
X264_HASH
:=
fa3cac516cb71b8ece09cedbfd0ce631ca8a2a4c
X264_HASH
:=
fa3cac516cb71b8ece09cedbfd0ce631ca8a2a4c
endif
endif
X264_GITURL
:=
git://git
.videolan.org/x264.git
X264_GITURL
:=
https://code
.videolan.org/
videolan/
x264.git
ifeq
($(call need_pkg,"x264 >= 0.86"),)
ifeq
($(call need_pkg,"x264 >= 0.86"),)
PKGS_FOUND
+=
x264
PKGS_FOUND
+=
x264
...
@@ -51,14 +51,6 @@ x264: x264-$(X264_HASH).tar.xz .sum-x264
...
@@ -51,14 +51,6 @@ x264: x264-$(X264_HASH).tar.xz .sum-x264
(
cd
$@
-
$(
X264_HASH
)
&&
tar
x
$(
if
${
BATCH_MODE
}
,,-v
)
--strip-components
=
1
-f
../
$<
)
(
cd
$@
-
$(
X264_HASH
)
&&
tar
x
$(
if
${
BATCH_MODE
}
,,-v
)
--strip-components
=
1
-f
../
$<
)
ifdef
HAVE_IOS
ifdef
HAVE_IOS
$(
APPLY
)
$(
SRC
)
/x264/remove-align.patch
$(
APPLY
)
$(
SRC
)
/x264/remove-align.patch
endif
ifdef
HAVE_ANDROID
ifeq
($(ARCH),arm)
$(
APPLY
)
$(
SRC
)
/x264/0001-use-internal-log2f.patch
endif
ifeq
($(ARCH),i386)
$(
APPLY
)
$(
SRC
)
/x264/0001-use-internal-log2f.patch
endif
endif
endif
$(
UPDATE_AUTOCONFIG
)
$(
UPDATE_AUTOCONFIG
)
$(
MOVE
)
$(
MOVE
)
...
...
This diff is collapsed.
Click to expand it.
Adrien Béraud
@aberaud
mentioned in commit
c564fb99
·
6 years ago
mentioned in commit
c564fb99
mentioned in commit c564fb99e3b271fe33a822897f3dabb6771a405b
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment