[SCM] libva/master: debian/patches/: patchset re-worked on new source

mfv-guest at users.alioth.debian.org mfv-guest at users.alioth.debian.org
Wed Jun 6 16:12:58 UTC 2012 

The following commit has been merged in the master branch:
commit 01d557c8bfea06488bfdf5f7c8aff62e20a1963a
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Wed Jun 6 18:06:43 2012 +0200

    debian/patches/: patchset re-worked on new source

diff --git a/debian/patches/0001-Remove_unneeded_dependencies.patch b/debian/patches/0001-Remove_unneeded_dependencies.patch
new file mode 100644
index 0000000..dd8e35d
--- /dev/null
+++ b/debian/patches/0001-Remove_unneeded_dependencies.patch
@@ -0,0 +1,52 @@
+From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
+Date: Wed, 6 Jun 2012 16:35:32 +0200
+Subject: Remove_unneeded_dependencies
+
+---
+ dummy_drv_video/Makefile.am |    2 --
+ test/basic/Makefile.am      |    3 ++-
+ va/Makefile.am              |    4 ++--
+ 3 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/dummy_drv_video/Makefile.am b/dummy_drv_video/Makefile.am
+index 245e6e8..50f8ee9 100644
+--- a/dummy_drv_video/Makefile.am
++++ b/dummy_drv_video/Makefile.am
+@@ -26,8 +26,6 @@ if BUILD_DUMMY_DRIVER
+ dummy_drv_video_la_LTLIBRARIES	= dummy_drv_video.la
+ dummy_drv_video_ladir		= $(LIBVA_DRIVERS_PATH)
+ dummy_drv_video_la_LDFLAGS	= -module -avoid-version -no-undefined -Wl,--no-undefined
+-dummy_drv_video_la_LIBADD	= $(top_builddir)/va/$(libvabackendlib)
+-dummy_drv_video_la_DEPENDENCIES	= $(top_builddir)/va/$(libvabackendlib)
+ dummy_drv_video_la_SOURCES	= dummy_drv_video.c object_heap.c
+ noinst_HEADERS			= dummy_drv_video.h object_heap.h
+ endif
+diff --git a/test/basic/Makefile.am b/test/basic/Makefile.am
+index c84c264..70a8216 100644
+--- a/test/basic/Makefile.am
++++ b/test/basic/Makefile.am
+@@ -25,7 +25,8 @@ check_PROGRAMS = test_01 test_02 test_03 test_04 test_05 test_06 \
+ 
+ AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
+ 
+-TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
++TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) \
++  $(top_builddir)/va/$(libvacorelib) $(X11_LIBS)
+ 
+ test_01_LDADD = $(TEST_LIBS)
+ test_01_SOURCES = test_01.c
+diff --git a/va/Makefile.am b/va/Makefile.am
+index bc70435..a086d78 100644
+--- a/va/Makefile.am
++++ b/va/Makefile.am
+@@ -71,8 +71,8 @@ SUBDIRS				+= x11
+ lib_LTLIBRARIES			+= libva-x11.la
+ libva_x11_la_SOURCES		= 
+ libva_x11_la_LDFLAGS		= $(LDADD)
+-libva_x11_la_DEPENDENCIES	= $(libvacorelib) x11/libva_x11.la
+-libva_x11_la_LIBADD		= $(libvacorelib) x11/libva_x11.la \
++libva_x11_la_DEPENDENCIES	= x11/libva_x11.la
++libva_x11_la_LIBADD		= x11/libva_x11.la \
+ 	$(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS) -ldl
+ 
+ if USE_GLX
diff --git a/debian/patches/kfreebsd-fixes.patch b/debian/patches/0002-Fix_FTBFS_on_kFreeBSD.patch
similarity index 64%
rename from debian/patches/kfreebsd-fixes.patch
rename to debian/patches/0002-Fix_FTBFS_on_kFreeBSD.patch
index 966007b..d7d985e 100644
--- a/debian/patches/kfreebsd-fixes.patch
+++ b/debian/patches/0002-Fix_FTBFS_on_kFreeBSD.patch
@@ -1,21 +1,34 @@
+From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
+Date: Wed, 6 Jun 2012 16:55:35 +0200
+Subject: Fix_FTBFS_on_kFreeBSD
+
+---
 From: Petr Salinger <Petr.Salinger at seznam.cz>
 Subject: libva: FTBFS on GNU/kFreeBSD
 Date: Tue, 8 Feb 2011 19:22:15 +0100 (CET)
 Bug-Debian: http://bugs.debian.org/612480
 
+ va/va_backend.h     |    2 ++
+ va/va_backend_tpi.h |    6 ++++++
+ va/va_tpi.c         |    3 +++
+ 3 files changed, 11 insertions(+)
+
+diff --git a/va/va_backend.h b/va/va_backend.h
+index 47ca719..01cc17d 100644
 --- a/va/va_backend.h
 +++ b/va/va_backend.h
-@@ -33,7 +33,10 @@
- #ifndef ANDROID
- #include <X11/Xlib.h>
- #endif
-+
+@@ -30,7 +30,9 @@
+ #define _VA_BACKEND_H_
+ 
+ #include <va/va.h>
 +#ifdef __linux__
  #include <linux/videodev2.h>
 +#endif
  
  typedef struct VADriverContext *VADriverContextP;
  typedef struct VADisplayContext *VADisplayContextP;
+diff --git a/va/va_backend_tpi.h b/va/va_backend_tpi.h
+index 56998de..95cc0bd 100644
 --- a/va/va_backend_tpi.h
 +++ b/va/va_backend_tpi.h
 @@ -32,7 +32,9 @@
@@ -28,7 +41,7 @@ Bug-Debian: http://bugs.debian.org/612480
  
  struct VADriverVTableTPI
  {
-@@ -43,6 +45,8 @@
+@@ -43,6 +45,8 @@ struct VADriverVTableTPI
  		VASurfaceID *surface		/* out */
  	);
      
@@ -37,18 +50,20 @@ Bug-Debian: http://bugs.debian.org/612480
          VAStatus (*vaCreateSurfaceFromV4L2Buf) (
  		VADriverContextP ctx,
                  int v4l2_fd,         /* file descriptor of V4L2 device */
-@@ -51,6 +55,8 @@
+@@ -51,6 +55,8 @@ struct VADriverVTableTPI
                  VASurfaceID *surface	           /* out */
          );
  
-+#endif 
++#endif
 +
          VAStatus (*vaCreateSurfacesForUserPtr)(
  		VADriverContextP ctx,
                  int width,
+diff --git a/va/va_tpi.c b/va/va_tpi.c
+index e9169fc..036f6a5 100644
 --- a/va/va_tpi.c
 +++ b/va/va_tpi.c
-@@ -66,6 +66,8 @@
+@@ -66,6 +66,8 @@ VAStatus vaCreateSurfaceFromCIFrame (
    
  }
  
@@ -57,7 +72,7 @@ Bug-Debian: http://bugs.debian.org/612480
  /* Wrap a V4L2 buffer as a VA surface, so that V4L2 camera, VA encode
   * can share the data without copy
   * The VA driver should query the camera device from v4l2_fd to see
-@@ -98,6 +100,7 @@
+@@ -98,6 +100,7 @@ VAStatus vaCreateSurfaceFromV4L2Buf(
        return VA_STATUS_ERROR_UNIMPLEMENTED;
  }
  
diff --git a/debian/patches/remove-unneeded-dep.patch b/debian/patches/remove-unneeded-dep.patch
deleted file mode 100644
index 9f97a18..0000000
--- a/debian/patches/remove-unneeded-dep.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Andres Mejia <mcitadel at gmail.com>
-Date: Wed Jun 2 18:30:20 2010 -0400
-Description: Patch to remove unnecessary dependency to libva-x11 for dummy driver
-
-==========================================================================
---- a/dummy_drv_video/Makefile.am
-+++ b/dummy_drv_video/Makefile.am
-@@ -26,8 +26,6 @@
- dummy_drv_video_la_LTLIBRARIES	= dummy_drv_video.la
- dummy_drv_video_ladir		= $(LIBVA_DRIVERS_PATH)
- dummy_drv_video_la_LDFLAGS	= -module -avoid-version -no-undefined -Wl,--no-undefined
--dummy_drv_video_la_LIBADD	= $(top_builddir)/va/$(libvabackendlib)
--dummy_drv_video_la_DEPENDENCIES	= $(top_builddir)/va/$(libvabackendlib)
- dummy_drv_video_la_SOURCES	= dummy_drv_video.c object_heap.c
- noinst_HEADERS			= dummy_drv_video.h object_heap.h
- endif
diff --git a/debian/patches/remove-unneeded-dep2.patch b/debian/patches/remove-unneeded-dep2.patch
deleted file mode 100644
index 84dd212..0000000
--- a/debian/patches/remove-unneeded-dep2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Artur Rona <ari-tczew at ubuntu.com>
-Description: Fix FTBFS with ld --no-add-needed. Remove unnecessary dependency on libva for libva-x11. libva-x11 uses none of libva's symbols. But it uses -lX11, which fixes FTBFS on ubuntu natty.
-Bug-Debian: http://bugs.debian.org/609554
-Author: Matthias Klose <doko at ubuntu.com>
-Last-Update: 2011-02-13
-
---- a/va/Makefile.am
-+++ b/va/Makefile.am
-@@ -71,8 +71,8 @@
- lib_LTLIBRARIES			+= libva-x11.la
- libva_x11_la_SOURCES		= 
- libva_x11_la_LDFLAGS		= $(LDADD)
--libva_x11_la_DEPENDENCIES	= $(libvacorelib) x11/libva_x11.la
--libva_x11_la_LIBADD		= $(libvacorelib) x11/libva_x11.la \
-+libva_x11_la_DEPENDENCIES	= x11/libva_x11.la
-+libva_x11_la_LIBADD		= x11/libva_x11.la \
- 	$(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS) -ldl
- 
- if USE_GLX
---- a/test/basic/Makefile.am
-+++ b/test/basic/Makefile.am
-@@ -25,7 +25,8 @@
- 
- AM_CFLAGS = -I$(top_srcdir)/va -I$(top_srcdir)/src/x11
- 
--TEST_LIBS = $(top_builddir)/va/$(libvabackendlib)
-+TEST_LIBS = $(top_builddir)/va/$(libvabackendlib) \
-+  $(top_builddir)/va/$(libvacorelib) $(X11_LIBS)
- 
- test_01_LDADD = $(TEST_LIBS)
- test_01_SOURCES = test_01.c
diff --git a/debian/patches/series b/debian/patches/series
index 4f9d87f..b25eecc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-remove-unneeded-dep.patch
-remove-unneeded-dep2.patch
-kfreebsd-fixes.patch
+0001-Remove_unneeded_dependencies.patch
+0002-Fix_FTBFS_on_kFreeBSD.patch

-- 
libva packaging

More information about the pkg-multimedia-commits mailing list