[packages/xorg-lib-libXvMC] - fix building xvmcinfo without libXvMC installed - fix libXvMCW linking

baggins baggins at pld-linux.org
Wed Dec 24 13:03:05 CET 2014


commit 45886f053a0e54aae3e09ed2b82c61ea399c8995
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Dec 24 12:05:08 2014 +0000

    - fix building xvmcinfo without libXvMC installed
    - fix libXvMCW linking

 dlopen.patch          | 11 +++++++++++
 xorg-lib-libXvMC.spec |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/xorg-lib-libXvMC.spec b/xorg-lib-libXvMC.spec
index 622601a..bfd902c 100644
--- a/xorg-lib-libXvMC.spec
+++ b/xorg-lib-libXvMC.spec
@@ -9,6 +9,7 @@ Source0:	http://xorg.freedesktop.org/releases/individual/lib/libXvMC-%{version}.
 # Source0-md5:	2e4014e9d55c430e307999a6b3dd256d
 Source1:	XvMCConfig
 Source2:	xvmcinfo.c
+Patch0:		dlopen.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -77,6 +78,7 @@ Pakiet zawiera statyczne biblioteki libXvMC.
 
 %prep
 %setup -q -n libXvMC-%{version}
+%patch0 -p1
 cp -p %{SOURCE2} .
 
 %build
@@ -89,7 +91,7 @@ cp -p %{SOURCE2} .
 
 %{__make}
 
-%{__cc} %{rpmcflags} %{rpmldflags} xvmcinfo.c -lX11 -lXv -lXvMC -o xvmcinfo
+%{__cc} %{rpmcflags} -I./include %{rpmldflags} -L./src/.libs xvmcinfo.c -lX11 -lXv -lXvMC -o xvmcinfo
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/dlopen.patch b/dlopen.patch
new file mode 100644
index 0000000..c3ea3b0
--- /dev/null
+++ b/dlopen.patch
@@ -0,0 +1,11 @@
+--- libXvMC-1.0.8/wrapper/Makefile.am~	2013-06-14 05:57:13.000000000 +0000
++++ libXvMC-1.0.8/wrapper/Makefile.am	2014-12-24 12:03:56.243701136 +0000
+@@ -10,7 +10,7 @@
+ AM_CFLAGS = $(CWARNFLAGS) $(XVMC_CFLAGS)
+ 
+ libXvMCW_la_SOURCES = XvMCWrapper.c
+-libXvMCW_la_LIBADD = $(XVMC_LIBS)
++libXvMCW_la_LIBADD = $(XVMC_LIBS) -ldl
+ libXvMCW_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+ 
+ if LINT
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-lib-libXvMC.git/commitdiff/45886f053a0e54aae3e09ed2b82c61ea399c8995



More information about the pld-cvs-commit mailing list