[SCM] libva/master: use variable $(X11_LIBS) instead of hardcoded -lX11
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Jan 8 13:00:38 UTC 2011
The following commit has been merged in the master branch:
commit dada4aeb41e615f7eb6b8241ab550ce29973a8b2
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat Jan 8 13:20:36 2011 +0100
use variable $(X11_LIBS) instead of hardcoded -lX11
Git-Dch: Ignore
diff --git a/debian/patches/remove-unneeded-dep2.patch b/debian/patches/remove-unneeded-dep2.patch
index 9cf766a..91761db 100644
--- a/debian/patches/remove-unneeded-dep2.patch
+++ b/debian/patches/remove-unneeded-dep2.patch
@@ -27,7 +27,7 @@ on ubuntu natty
-TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) \
-+ $(top_builddir)/va/$(libvacorelib) -lX11
++ $(top_builddir)/va/$(libvacorelib) $(X11_LIBS)
test_01_LDADD = $(TEST_LIBS)
test_01_SOURCES = test_01.c
@@ -39,7 +39,7 @@ on ubuntu natty
-TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) \
-+ $(top_builddir)/va/$(libvacorelib) -lX11
++ $(top_builddir)/va/$(libvacorelib) $(X11_LIBS)
mpeg2vldemo_LDADD = $(TEST_LIBS)
mpeg2vldemo_SOURCES = mpeg2vldemo.c
@@ -51,7 +51,7 @@ on ubuntu natty
-TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) \
-+ $(top_builddir)/va/$(libvacorelib) -lX11
++ $(top_builddir)/va/$(libvacorelib) $(X11_LIBS)
h264encode_LDADD = $(TEST_LIBS)
h264encode_SOURCES = h264encode.c
@@ -64,7 +64,7 @@ on ubuntu natty
-TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) -lpthread
+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) \
+ $(top_builddir)/va/$(libvacorelib) \
-+ -lX11 -lpthread
++ $(X11_LIBS)
putsurface_LDADD = $(TEST_LIBS)
putsurface_SOURCES = putsurface.c
--
libva packaging
More information about the pkg-multimedia-commits
mailing list