[SCM] libva packaging branch, master, updated. upstream/1.0.1-13-g776aa25
ceros-guest at users.alioth.debian.org
ceros-guest at users.alioth.debian.org
Wed Jun 2 22:56:51 UTC 2010
The following commit has been merged in the master branch:
commit 776aa2512c2e99c4026f44fbdb161916e867e5e9
Author: Andres Mejia <mcitadel at gmail.com>
Date: Wed Jun 2 18:56:28 2010 -0400
Remove unnecessary dependency on libva for libva-x11.
diff --git a/debian/patches/autoreconf.patch b/debian/patches/autoreconf.patch
index 00e1788..ddae228 100644
--- a/debian/patches/autoreconf.patch
+++ b/debian/patches/autoreconf.patch
@@ -1242,6 +1242,18 @@ Patch that applies modifications after running 'autoreconf -vif'
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
+@@ -310,9 +312,9 @@
+ libva_la_LDFLAGS = $(LDADD) -no-undefined
+ libva_la_LIBADD = $(LIBVA_LIBS) -ldl
+ libva_x11_la_SOURCES =
+-libva_x11_la_LIBADD = $(libvacorelib) x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS)
++libva_x11_la_LIBADD = x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS)
+ libva_x11_la_LDFLAGS = $(LDADD)
+-libva_x11_la_DEPENDENCIES = $(libvacorelib) x11/libva_x11.la
++libva_x11_la_DEPENDENCIES = x11/libva_x11.la
+ SUBDIRS = x11
+ libva_la_SOURCES = va.c
+ libvaincludedir = ${includedir}/va
--- a/src/x11/Makefile.in
+++ b/src/x11/Makefile.in
@@ -179,6 +179,8 @@
@@ -1264,6 +1276,21 @@ Patch that applies modifications after running 'autoreconf -vif'
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
+@@ -262,8 +264,12 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/x11 -DIN_LIBVA
+-vainfo_LDADD = $(top_srcdir)/src/$(libvabackendlib)
+-vainfo_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib)
++vainfo_LDADD = $(top_srcdir)/src/$(libvabackendlib) \
++ $(top_srcdir)/src/$(libvacorelib)
++
++vainfo_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib) \
++ $(top_srcdir)/src/$(libvacorelib)
++
+ vainfo_SOURCES = vainfo.c
+ SUBDIRS = basic decode encode putsurface
+ all: all-recursive
--- a/test/basic/Makefile.in
+++ b/test/basic/Makefile.in
@@ -196,6 +196,8 @@
@@ -1275,6 +1302,17 @@ Patch that applies modifications after running 'autoreconf -vif'
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
+@@ -264,7 +266,9 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
+-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
++TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) \
++ $(top_srcdir)/src/$(libvacorelib)
++
+ test_01_LDADD = $(TEST_LIBS)
+ test_01_SOURCES = test_01.c
+ test_02_LDADD = $(TEST_LIBS)
--- a/test/decode/Makefile.in
+++ b/test/decode/Makefile.in
@@ -157,6 +157,8 @@
@@ -1286,6 +1324,17 @@ Patch that applies modifications after running 'autoreconf -vif'
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
+@@ -225,7 +227,9 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
+-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
++TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) \
++ $(top_srcdir)/src/$(libvacorelib)
++
+ mpeg2vldemo_LDADD = $(TEST_LIBS)
+ mpeg2vldemo_SOURCES = mpeg2vldemo.c
+ all: all-am
--- a/test/encode/Makefile.in
+++ b/test/encode/Makefile.in
@@ -157,6 +157,8 @@
@@ -1297,6 +1346,17 @@ Patch that applies modifications after running 'autoreconf -vif'
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
+@@ -225,7 +227,9 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
+-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
++TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) \
++ $(top_srcdir)/src/$(libvacorelib)
++
+ h264encode_LDADD = $(TEST_LIBS)
+ h264encode_SOURCES = h264encode.c
+ all: all-am
--- a/test/putsurface/Makefile.in
+++ b/test/putsurface/Makefile.in
@@ -157,6 +157,8 @@
@@ -1308,3 +1368,14 @@ Patch that applies modifications after running 'autoreconf -vif'
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
+@@ -225,7 +227,9 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
+-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
++TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) \
++ $(top_srcdir)/src/$(libvacorelib)
++
+ putsurface_LDADD = $(TEST_LIBS)
+ putsurface_SOURCES = putsurface.c
+ all: all-am
diff --git a/debian/patches/remove-unneeded-dep2.patch b/debian/patches/remove-unneeded-dep2.patch
new file mode 100644
index 0000000..3fb4ca9
--- /dev/null
+++ b/debian/patches/remove-unneeded-dep2.patch
@@ -0,0 +1,80 @@
+Patch to remove unnecessary dependency on libva for libva-x11. libva-x11 uses
+none of libva's symbols.
+==========================================================================
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -37,9 +37,9 @@
+ libva_la_LIBADD = $(LIBVA_LIBS) -ldl
+
+ libva_x11_la_SOURCES =
+-libva_x11_la_LIBADD = $(libvacorelib) x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS)
++libva_x11_la_LIBADD = x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS)
+ libva_x11_la_LDFLAGS = $(LDADD)
+-libva_x11_la_DEPENDENCIES = $(libvacorelib) x11/libva_x11.la
++libva_x11_la_DEPENDENCIES = x11/libva_x11.la
+
+ SUBDIRS = x11
+
+--- a/test/basic/Makefile.am
++++ b/test/basic/Makefile.am
+@@ -25,7 +25,8 @@
+
+ AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
+
+-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
++TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) \
++ $(top_srcdir)/src/$(libvacorelib)
+
+ test_01_LDADD = $(TEST_LIBS)
+ test_01_SOURCES = test_01.c
+--- a/test/decode/Makefile.am
++++ b/test/decode/Makefile.am
+@@ -24,7 +24,8 @@
+
+ AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
+
+-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
++TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) \
++ $(top_srcdir)/src/$(libvacorelib)
+
+ mpeg2vldemo_LDADD = $(TEST_LIBS)
+ mpeg2vldemo_SOURCES = mpeg2vldemo.c
+--- a/test/encode/Makefile.am
++++ b/test/encode/Makefile.am
+@@ -24,7 +24,8 @@
+
+ AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
+
+-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
++TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) \
++ $(top_srcdir)/src/$(libvacorelib)
+
+ h264encode_LDADD = $(TEST_LIBS)
+ h264encode_SOURCES = h264encode.c
+--- a/test/putsurface/Makefile.am
++++ b/test/putsurface/Makefile.am
+@@ -24,7 +24,8 @@
+
+ AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 -DIN_LIBVA
+
+-TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib)
++TEST_LIBS = $(top_srcdir)/src/$(libvabackendlib) \
++ $(top_srcdir)/src/$(libvacorelib)
+
+ putsurface_LDADD = $(TEST_LIBS)
+ putsurface_SOURCES = putsurface.c
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -26,8 +26,10 @@
+ AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test/basic -I$(top_srcdir)/src/x11 -DIN_LIBVA
+
+
+-vainfo_LDADD = $(top_srcdir)/src/$(libvabackendlib)
+-vainfo_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib)
++vainfo_LDADD = $(top_srcdir)/src/$(libvabackendlib) \
++ $(top_srcdir)/src/$(libvacorelib)
++vainfo_DEPENDENCIES = $(top_srcdir)/src/$(libvabackendlib) \
++ $(top_srcdir)/src/$(libvacorelib)
+ vainfo_SOURCES = vainfo.c
+
+ SUBDIRS = basic decode encode putsurface
diff --git a/debian/patches/series b/debian/patches/series
index 487b453..193b5d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
fix-warnings.patch
remove-unneeded-dep.patch
+remove-unneeded-dep2.patch
autoreconf.patch
--
libva packaging
More information about the pkg-multimedia-commits
mailing list