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

Tobias Grimm tiber-guest at costa.debian.org
Sun Sep 4 09:15:36 UTC 2005 

Author: tiber-guest
Date: 2005-09-04 09:15:36 +0000 (Sun, 04 Sep 2005)
New Revision: 1198

Removed:
   vdr/vdr-plugin-softdevice/trunk/debian/patches/05_offset_t.dpatch
Modified:
   vdr/vdr-plugin-softdevice/trunk/debian/changelog
   vdr/vdr-plugin-softdevice/trunk/debian/patches/00list
   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:
new upstream release

Modified: vdr/vdr-plugin-softdevice/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/changelog	2005-09-02 22:51:34 UTC (rev 1197)
+++ vdr/vdr-plugin-softdevice/trunk/debian/changelog	2005-09-04 09:15:36 UTC (rev 1198)
@@ -1,3 +1,11 @@
+vdr-plugin-softdevice (0.1.3-1) UNRELEASED; urgency=low
+
+  * (NOT RELEASED YET) New upstream release
+  * Updated 01_Makefile-fPIC-fix, 04_debian_ffmpeg, 06_dfb++.dpatch
+  * Removed 05_offset_t (fixed in upstream)
+
+ -- Tobias Grimm <tg at e-tobi.net>  Sun,  4 Sep 2005 11:09:52 +0200
+
 vdr-plugin-softdevice (0.1.2-8) unstable; urgency=low
 
   * Thomas Schmidt <tschmidt at debian.org>

Modified: vdr/vdr-plugin-softdevice/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/00list	2005-09-02 22:51:34 UTC (rev 1197)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/00list	2005-09-04 09:15:36 UTC (rev 1198)
@@ -2,5 +2,4 @@
 02_disable_unsupported_output
 03_no_sub_libs
 04_debian_ffmpeg
-05_offset_t
 06_dfb++

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-09-02 22:51:34 UTC (rev 1197)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/01_Makefile-fPIC-fix.dpatch	2005-09-04 09:15:36 UTC (rev 1198)
@@ -5,15 +5,15 @@
 ## DP: Adds -fPIC to Makefile 
 
 @DPATCH@
-diff -urNad softdevice-0.1.1/Makefile /tmp/dpep.Tg2iZ1/softdevice-0.1.1/Makefile
---- softdevice-0.1.1/Makefile	2005-03-19 23:01:21.000000000 +0100
-+++ /tmp/dpep.Tg2iZ1/softdevice-0.1.1/Makefile	2005-05-20 22:35:21.000000000 +0200
+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 @@
  ### normally you shoudn't have to touch something below this line
  
  CXX      ?= g++
--CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual -L$(LIBAVCODEC)
-+CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual -L$(LIBAVCODEC)
+-CXXFLAGS ?= -O2 -g -Wall -Woverloaded-virtual -L$(LIBAVCODEC)
++CXXFLAGS ?= -fPIC -O2 -g -Wall -Woverloaded-virtual -L$(LIBAVCODEC)
  
  ### 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-09-02 22:51:34 UTC (rev 1197)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/04_debian_ffmpeg.dpatch	2005-09-04 09:15:36 UTC (rev 1198)
@@ -5,9 +5,9 @@
 ## DP: Compile with static Debian ffmpeg libs
 
 @DPATCH@
-diff -urNad softdevice-0.1.1/Makefile /tmp/dpep.M0zRP2/softdevice-0.1.1/Makefile
---- softdevice-0.1.1/Makefile	2005-05-20 22:36:02.000000000 +0200
-+++ /tmp/dpep.M0zRP2/softdevice-0.1.1/Makefile	2005-05-20 22:36:32.000000000 +0200
+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 @@
  #
  #
@@ -21,8 +21,8 @@
  ### normally you shoudn't have to touch something below this line
  
  CXX      ?= g++
--CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual -L$(LIBAVCODEC)
-+CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual `ffmpeg-config --cflags`
+-CXXFLAGS ?= -fPIC -O2 -g -Wall -Woverloaded-virtual -L$(LIBAVCODEC)
++CXXFLAGS ?= -fPIC -O2 -g -Wall -Woverloaded-virtual `ffmpeg-config --cflags`
  
  ### The directory environment:
  

Deleted: vdr/vdr-plugin-softdevice/trunk/debian/patches/05_offset_t.dpatch
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/05_offset_t.dpatch	2005-09-02 22:51:34 UTC (rev 1197)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/05_offset_t.dpatch	2005-09-04 09:15:36 UTC (rev 1198)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_offset_t.dpatch by Tobias Grimm <tg at e-tobi.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix return type to offset_t to for ffmpeg cvs20050626
-
- at DPATCH@
---- vdr-plugin-softdevice-0.1.2.orig/mpeg2decoder.c
-+++ vdr-plugin-softdevice-0.1.2/mpeg2decoder.c
-@@ -922,7 +922,7 @@
-      return -1;
- };
-      
--static int seek_RingBuffer(void *opaque, offset_t offset, int whence) {
-+static offset_t seek_RingBuffer(void *opaque, offset_t offset, int whence) {
-      cMpeg2Decoder *Dec=(cMpeg2Decoder *)(opaque);
-      if (Dec) 
-        return Dec->seek(offset, whence);

Modified: vdr/vdr-plugin-softdevice/trunk/debian/patches/06_dfb++.dpatch
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/06_dfb++.dpatch	2005-09-02 22:51:34 UTC (rev 1197)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/06_dfb++.dpatch	2005-09-04 09:15:36 UTC (rev 1198)
@@ -5,16 +5,16 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./Makefile /tmp/dpep-work.knwtrD/vdr-plugin-softdevice-0.1.2/Makefile
---- ./Makefile	2005-07-31 12:37:16.000000000 +0200
-+++ /tmp/dpep-work.knwtrD/vdr-plugin-softdevice-0.1.2/Makefile	2005-07-31 12:39:11.000000000 +0200
+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 @@
  
  ifdef DFB_SUPPORT
    ifdef USE_SUBPLUGINS
 -    DFB_LIBS  = -L/usr/local/lib -ldfb++
 +    DFB_LIBS  = -L/usr/lib -ldfb++
-     DFB_OBJS  = video.o video-dfb.o
+     DFB_OBJS  = utils.o video.o video-dfb.o
      ALL_OBJS += $(DFB_OBJS)
      TARGETS  += libvdr-$(PLUGIN)-dfb.so
    else

More information about the pkg-vdr-dvb-changes mailing list