r3552 - in vdr/vdr-plugin-softdevice/trunk/debian: . patches
Tobias Grimm
tiber-guest at costa.debian.org
Sun Oct 15 11:34:30 UTC 2006
Author: tiber-guest
Date: 2006-10-15 11:34:29 +0000 (Sun, 15 Oct 2006)
New Revision: 3552
Removed:
vdr/vdr-plugin-softdevice/trunk/debian/patches/02_disable_unsupported_output.dpatch
vdr/vdr-plugin-softdevice/trunk/debian/patches/03_no_sub_libs.dpatch
vdr/vdr-plugin-softdevice/trunk/debian/patches/05_FFMPEG_VERSION.dpatch
Modified:
vdr/vdr-plugin-softdevice/trunk/debian/TODO
vdr/vdr-plugin-softdevice/trunk/debian/changelog
vdr/vdr-plugin-softdevice/trunk/debian/control
vdr/vdr-plugin-softdevice/trunk/debian/patches/00list
vdr/vdr-plugin-softdevice/trunk/debian/rules
Log:
* New upstream release
* Removed 02_disable_unsupported_output.dpatch
* Removed 03_no_sub_libs.dpatch
* Rebuilt build dependencies by a clever script that finds the packages which
provide the include files referenced in the sources - I hope
the results are correct
Modified: vdr/vdr-plugin-softdevice/trunk/debian/TODO
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/TODO 2006-10-14 19:46:40 UTC (rev 3551)
+++ vdr/vdr-plugin-softdevice/trunk/debian/TODO 2006-10-15 11:34:29 UTC (rev 3552)
@@ -1,3 +1,4 @@
TODO:
- Manpage for ShmClient
+- Use sublugins to split depenencies on framebuffer and xv
Modified: vdr/vdr-plugin-softdevice/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/changelog 2006-10-14 19:46:40 UTC (rev 3551)
+++ vdr/vdr-plugin-softdevice/trunk/debian/changelog 2006-10-15 11:34:29 UTC (rev 3552)
@@ -1,6 +1,12 @@
-vdr-plugin-softdevice (0.2.3a-8) UNRELEASED; urgency=low
+vdr-plugin-softdevice (0.3.0-1) UNRELEASED; urgency=low
- * NOT RELEASED YET
+ * (NOT RELEASED YET)
+ * New upstream release
+ * Removed 02_disable_unsupported_output.dpatch
+ * Removed 03_no_sub_libs.dpatch
+ * Rebuilt build dependencies by a clever script that finds the packages which
+ provide the include files referenced in the sources - I hope
+ the results are correct
* Added 07_amd_64.dpatch to fix AMD64 compilation problem as reported
by Ingo Theiss <cthulhu at planet-multiplayer.de>
Modified: vdr/vdr-plugin-softdevice/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/control 2006-10-14 19:46:40 UTC (rev 3551)
+++ vdr/vdr-plugin-softdevice/trunk/debian/control 2006-10-15 11:34:29 UTC (rev 3552)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
Uploaders: Thomas Schmidt <tschmidt at debian.org>, Nicolas Huillard <nicolas at huillard.net>, Tobias Grimm <tg at e-tobi.net>
-Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>=1.4.3-1), zlib1g-dev, libavcodec-dev (>= 0.cvs20060329-4), libavformat-dev (>= 0.cvs20060329-4), libasound2-dev, libdfb++-dev, libdirectfb-dev, libxv-dev, libxi-dev
+Build-Depends: debhelper (>> 4.1.16), dpatch, vdr-dev (>=1.4.3-1), libavcodec-dev (>= 0.cvs20060329-4), libavformat-dev (>= 0.cvs20060329-4), libasound2-dev, libdfb++-dev, libdirectfb-dev, libxv-dev, libx11-dev, x11proto-core-dev, x11proto-xext-dev, x11proto-xinerama-dev, libxext-dev, libxinerama-dev, zlib1g-dev
Standards-Version: 3.7.2
Package: vdr-plugin-softdevice
Modified: vdr/vdr-plugin-softdevice/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/00list 2006-10-14 19:46:40 UTC (rev 3551)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/00list 2006-10-15 11:34:29 UTC (rev 3552)
@@ -1,6 +1,3 @@
-02_disable_unsupported_output
-03_no_sub_libs
04_debian_ffmpeg
-05_FFMPEG_VERSION
06_dfb++
07_amd64
Deleted: vdr/vdr-plugin-softdevice/trunk/debian/patches/02_disable_unsupported_output.dpatch
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/02_disable_unsupported_output.dpatch 2006-10-14 19:46:40 UTC (rev 3551)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/02_disable_unsupported_output.dpatch 2006-10-15 11:34:29 UTC (rev 3552)
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_disable_unsupported_output.dpatch by Tobias Grimm <tg at e-tobi.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Disable output options, not supported in Debian yet
-
- at DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./Makefile /tmp/dpep-work.YfKVET/vdr-plugin-softdevice-0.1.2/Makefile
---- ./Makefile 2005-07-31 12:33:32.000000000 +0200
-+++ /tmp/dpep-work.YfKVET/vdr-plugin-softdevice-0.1.2/Makefile 2005-07-31 12:34:35.000000000 +0200
-@@ -31,7 +31,7 @@
- FB_SUPPORT=1
-
- # Vidix support by Vadim Catana
--VIDIX_SUPPORT=1
-+#VIDIX_SUPPORT=1
-
- # Set this if you want to use DPMS
- LIBXDPMS_SUPPORT = 1
-@@ -51,7 +51,7 @@
- # install -m 644 postprocess.h /usr/local/include/postproc/postprocess.h
- # cp libpostproc.a /usr/local/lib/
- #
--PP_LIBAVCODEC=1
-+#PP_LIBAVCODEC=1
-
- # -----------------------------------------------------------------------------
- # if you want output methods build as a single lib comment the following line
Deleted: vdr/vdr-plugin-softdevice/trunk/debian/patches/03_no_sub_libs.dpatch
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/03_no_sub_libs.dpatch 2006-10-14 19:46:40 UTC (rev 3551)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/03_no_sub_libs.dpatch 2006-10-15 11:34:29 UTC (rev 3552)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_no_sub_libs.dpatch by Tobias Grimm <tg at e-tobi.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Compile everything into one plugin lib.
-
- at DPATCH@
-diff -urNad softdevice-0.1.1/Makefile /tmp/dpep.dX4H8x/softdevice-0.1.1/Makefile
---- softdevice-0.1.1/Makefile 2005-03-19 23:01:21.000000000 +0100
-+++ /tmp/dpep.dX4H8x/softdevice-0.1.1/Makefile 2005-05-20 22:26:11.000000000 +0200
-@@ -55,7 +55,7 @@
-
- # -----------------------------------------------------------------------------
- # if you want output methods build as a single lib comment the following line
--USE_SUBPLUGINS = 1
-+#USE_SUBPLUGINS = 1
-
- # -----------------------------------------------------------------------------
- # framebuffer device name
Deleted: vdr/vdr-plugin-softdevice/trunk/debian/patches/05_FFMPEG_VERSION.dpatch
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/patches/05_FFMPEG_VERSION.dpatch 2006-10-14 19:46:40 UTC (rev 3551)
+++ vdr/vdr-plugin-softdevice/trunk/debian/patches/05_FFMPEG_VERSION.dpatch 2006-10-15 11:34:29 UTC (rev 3552)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_FFMPEG_VERSION.dpatch by Tobias Grimm <tg at e-tobi.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: In SVN revions 5502 FFMPEG_VERSION has been removed from avcodec.h,
-## DP: So we need to use LIBAVCODEC_VERSION now
-
- at DPATCH@
---- vdr-plugin-softdevice-0.2.3a.orig/softdevice.c
-+++ vdr-plugin-softdevice-0.2.3a/softdevice.c
-@@ -187,8 +187,8 @@
- #endif
- fprintf(stderr,"[softdevice] Initializing Video Out\n");
- fprintf(stderr,
-- "[softdevice] ffmpeg version(%s) build(%d)\n",
-- FFMPEG_VERSION, LIBAVCODEC_BUILD);
-+ "[softdevice] libavcodec version(%s) build(%d)\n",
-+ AV_STRINGIFY(LIBAVCODEC_VERSION), LIBAVCODEC_BUILD);
- setupStore.outputMethod = method;
- #ifdef USE_SUBPLUGINS
- switch (method) {
Modified: vdr/vdr-plugin-softdevice/trunk/debian/rules
===================================================================
--- vdr/vdr-plugin-softdevice/trunk/debian/rules 2006-10-14 19:46:40 UTC (rev 3551)
+++ vdr/vdr-plugin-softdevice/trunk/debian/rules 2006-10-15 11:34:29 UTC (rev 3552)
@@ -32,13 +32,14 @@
configure: configure-stamp
configure-stamp: patch-stamp
dh_testdir
+ ./configure --with-ffmpeg-path /usr/include/ffmpeg --disable-mmx \
+ --disable-mmx2 --disable-subplugins
touch configure-stamp
build: build-stamp
build-stamp: configure-stamp
dh_testdir
- $(MAKE) all ShmClient DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=. \
- LIBAVCODEC=/usr/include/ffmpeg
+ $(MAKE) all DVBDIR=/usr VDRDIR=/usr/include/$(VDR) LIBDIR=.
touch build-stamp
clean: clean-patched unpatch
More information about the pkg-vdr-dvb-changes
mailing list