r1584 - in vdr/vdr-plugin-softdevice/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2005-12-04 00:45:56 +0000 (Sun, 04 Dec 2005)
New Revision: 1584

Modified:
   vdr/vdr-plugin-softdevice/trunk/debian/changelog
   vdr/vdr-plugin-softdevice/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
   vdr/vdr-plugin-softdevice/trunk/debian/patches/04_debian_ffmpeg.dpatch
   vdr/vdr-plugin-softdevice/trunk/debian/patches/06_dfb++.dpatch
Log:
updated patches

Modified: vdr/vdr-plugin-softdevice/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/changelog	2005-12-03 23:59:09 UTC (rev 1583)
+++ vdr/vdr-plugin-softdevice/trunk/debian/changelog	2005-12-04 00:45:56 UTC (rev 1584)
@@ -2,6 +2,9 @@
 
   * Tobias Grimm <tg at e-tobi.net>
     - New upstream release  
+    - Updated 01_Makefile-fPIC-fix.dpatch
+    - Updated 04_debian_ffmpeg.dpatch
+    - Updated 06_dfb++.dpatch
   * Thomas Schmidt <tschmidt at debian.org>
     - Build-Depend on vdr (>=1.3.37-1)
 

Modified: vdr/vdr-plugin-softdevice/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2005-12-03 23:59:09 UTC (rev 1583)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2005-12-04 00:45:56 UTC (rev 1584)
@@ -5,15 +5,15 @@
 ## DP: Adds -fPIC to Makefile 
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./Makefile /tmp/dpep-work.OMRgow/vdr-plugin-softdevice-0.1.3/Makefile
---- ./Makefile	2005-07-15 22:42:16.000000000 +0200
-+++ /tmp/dpep-work.OMRgow/vdr-plugin-softdevice-0.1.3/Makefile	2005-09-04 11:12:34.000000000 +0200
-@@ -122,7 +122,7 @@
+diff -urNad vdr-plugin-softdevice-0.2.1~/Makefile vdr-plugin-softdevice-0.2.1/Makefile
+--- vdr-plugin-softdevice-0.2.1~/Makefile	2005-10-06 23:28:11.000000000 +0200
++++ vdr-plugin-softdevice-0.2.1/Makefile	2005-12-04 01:37:37.000000000 +0100
+@@ -184,7 +184,7 @@
  ### normally you shoudn't have to touch something below this line
  
  CXX      ?= g++
--CXXFLAGS ?= -O2 -g -Wall -Woverloaded-virtual -L$(LIBAVCODEC)
-+CXXFLAGS ?= -fPIC -O2 -g -Wall -Woverloaded-virtual -L$(LIBAVCODEC)
+-CXXFLAGS ?= -O2 -g -Wall -Woverloaded-virtual
++CXXFLAGS ?= -fPIC -O2 -g -Wall -Woverloaded-virtual
  
  ### The directory environment:
  

Modified: vdr/vdr-plugin-softdevice/trunk/debian/patches/04_debian_ffmpeg.dpatch
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/04_debian_ffmpeg.dpatch	2005-12-03 23:59:09 UTC (rev 1583)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/04_debian_ffmpeg.dpatch	2005-12-04 00:45:56 UTC (rev 1584)
@@ -5,23 +5,23 @@
 ## DP: Compile with static Debian ffmpeg libs
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./Makefile /tmp/dpep-work.Jsb1BC/vdr-plugin-softdevice-0.1.3/Makefile
---- ./Makefile	2005-09-04 11:14:38.000000000 +0200
-+++ /tmp/dpep-work.Jsb1BC/vdr-plugin-softdevice-0.1.3/Makefile	2005-09-04 11:15:42.000000000 +0200
-@@ -86,7 +86,7 @@
+diff -urNad vdr-plugin-softdevice-0.2.1~/Makefile vdr-plugin-softdevice-0.2.1/Makefile
+--- vdr-plugin-softdevice-0.2.1~/Makefile	2005-12-04 01:39:02.000000000 +0100
++++ vdr-plugin-softdevice-0.2.1/Makefile	2005-12-04 01:40:02.000000000 +0100
+@@ -101,7 +101,7 @@
  #
  #
  # DON'T touch this:
--FFMPEGLIBS = -lavcodec -lavformat
+-FFMPEGLIBS = -lavcodec -lavformat -lz
 +FFMPEGLIBS = `ffmpeg-config --plugin-libs avcodec avformat`
  #
  # -----------------------------------------------------------------------------
  # Depending on your ffmpeg lib you may need some additional libs
-@@ -122,7 +122,7 @@
+@@ -184,7 +184,7 @@
  ### normally you shoudn't have to touch something below this line
  
  CXX      ?= g++
--CXXFLAGS ?= -fPIC -O2 -g -Wall -Woverloaded-virtual -L$(LIBAVCODEC)
+-CXXFLAGS ?= -fPIC -O2 -g -Wall -Woverloaded-virtual
 +CXXFLAGS ?= -fPIC -O2 -g -Wall -Woverloaded-virtual `ffmpeg-config --cflags`
  
  ### The directory environment:

Modified: vdr/vdr-plugin-softdevice/trunk/debian/patches/06_dfb++.dpatch
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/06_dfb++.dpatch	2005-12-03 23:59:09 UTC (rev 1583)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/06_dfb++.dpatch	2005-12-04 00:45:56 UTC (rev 1584)
@@ -5,26 +5,17 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./Makefile /tmp/dpep-work.OMFbp1/vdr-plugin-softdevice-0.1.3/Makefile
---- ./Makefile	2005-09-04 11:18:56.000000000 +0200
-+++ /tmp/dpep-work.OMFbp1/vdr-plugin-softdevice-0.1.3/Makefile	2005-09-04 11:20:03.000000000 +0200
-@@ -160,16 +160,16 @@
+diff -urNad vdr-plugin-softdevice-0.2.1~/Makefile vdr-plugin-softdevice-0.2.1/Makefile
+--- vdr-plugin-softdevice-0.2.1~/Makefile	2005-12-04 01:41:16.000000000 +0100
++++ vdr-plugin-softdevice-0.2.1/Makefile	2005-12-04 01:43:14.000000000 +0100
+@@ -136,8 +136,8 @@
+ endif
  
  ifdef DFB_SUPPORT
-   ifdef USE_SUBPLUGINS
--    DFB_LIBS  = -L/usr/local/lib -ldfb++
-+    DFB_LIBS  = -L/usr/lib -ldfb++
-     DFB_OBJS  = utils.o video.o video-dfb.o
-     ALL_OBJS += $(DFB_OBJS)
-     TARGETS  += libvdr-$(PLUGIN)-dfb.so
-   else
-     OBJS     += video-dfb.o
--    LIBS     += -L/usr/local/lib -ldfb++
-+    LIBS     += -L/usr/lib -ldfb++
-   endif
+-  DFB_LIBS  = -L/usr/local/lib -ldfb++
+-  DFB_CFLAGS = -I/usr/local/include/dfb++ -I/usr/local/include/directfb
++  DFB_LIBS  = -L/usr/lib -ldfb++
++  DFB_CFLAGS = -I/usr/include/dfb++ -I/usr/include/directfb
    DEFINES  += -DDFB_SUPPORT
--  INCLUDES += -I/usr/local/include/dfb++ -I/usr/local/include/directfb
-+  INCLUDES += -I/usr/include/dfb++ -I/usr/include/directfb
  endif
  
- ifdef FB_SUPPORT