Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
f9ecbd07
Commit
f9ecbd07
authored
Aug 06, 2016
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: x265: fix static linking with pkg-config (fixes #16389)
parent
22e33287
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
0 deletions
+13
-0
contrib/src/x265/rules.mak
contrib/src/x265/rules.mak
+3
-0
contrib/src/x265/x265-pkg-libs.patch
contrib/src/x265/x265-pkg-libs.patch
+10
-0
No files found.
contrib/src/x265/rules.mak
View file @
f9ecbd07
...
@@ -28,6 +28,9 @@ x265: x265-$(X265_VERSION).tar.bz2 .sum-x265
...
@@ -28,6 +28,9 @@ x265: x265-$(X265_VERSION).tar.bz2 .sum-x265
$(BZCAT)
"
$<
"
|
(
cd
$@
-
$(X265_VERSION)
&&
tar
xv
--strip-components
=
1
)
$(BZCAT)
"
$<
"
|
(
cd
$@
-
$(X265_VERSION)
&&
tar
xv
--strip-components
=
1
)
$(APPLY)
$(SRC)
/x265/x265-ldl-linking.patch
$(APPLY)
$(SRC)
/x265/x265-ldl-linking.patch
$(
call
pkg_static,
"source/x265.pc.in"
)
$(
call
pkg_static,
"source/x265.pc.in"
)
ifndef
HAVE_WIN32
$(APPLY)
$(SRC)
/x265/x265-pkg-libs.patch
endif
$(MOVE)
$(MOVE)
.x265
:
x265 toolchain.cmake
.x265
:
x265 toolchain.cmake
...
...
contrib/src/x265/x265-pkg-libs.patch
0 → 100644
View file @
f9ecbd07
diff -Nru x265.orig/source/x265.pc.in x265/source/x265.pc.in
--- x265.orig/source/x265.pc.in 2016-08-06 17:04:25.925985965 +0300
+++ x265/source/x265.pc.in 2016-08-06 17:07:06.548987568 +0300
@@ -7,5 +7,5 @@
Description: H.265/HEVC video encoder
Version: @X265_LATEST_TAG@
Cflags: -I${includedir}
-Libs: -L${libdir} -lx265 @PRIVATE_LIBS@
+Libs: -L${libdir} -lx265 @PRIVATE_LIBS@ -ldl -lpthread
Requires:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment