r1374 - in general/xine-lib-vdr/trunk/debian: . patches
Thomas Schmidt
tschmidt at costa.debian.org
Mon Oct 3 10:44:06 UTC 2005
Author: tschmidt
Date: 2005-10-03 10:44:06 +0000 (Mon, 03 Oct 2005)
New Revision: 1374
Added:
general/xine-lib-vdr/trunk/debian/patches/05_quick_fix_empty_config.dpatch
Modified:
general/xine-lib-vdr/trunk/debian/changelog
general/xine-lib-vdr/trunk/debian/control
general/xine-lib-vdr/trunk/debian/patches/00list
general/xine-lib-vdr/trunk/debian/rules
Log:
xine-lib-vdr: resynced package with Darren's repository (1.0.2-0vdr2)
Modified: general/xine-lib-vdr/trunk/debian/changelog
===================================================================
--- general/xine-lib-vdr/trunk/debian/changelog 2005-10-02 16:38:09 UTC (rev 1373)
+++ general/xine-lib-vdr/trunk/debian/changelog 2005-10-03 10:44:06 UTC (rev 1374)
@@ -1,3 +1,12 @@
+xine-lib-vdr (1.0.2-0vdr2) unstable; urgency=low
+
+ * Fix a problem with config backup/save when an empty config file
+ already exists.
+ * Enable libdirectfb support (etch, sid).
+ * This version is compilable with gcc 4.0. Rewrite history accordingly.
+
+ -- Darren Salt <linux at youmustbejoking.demon.co.uk> Sun, 21 Aug 2005 21:22:20 +0100
+
xine-lib-vdr (1.0.2-0vdr1) unstable; urgency=low
* New upstream release; resync.
@@ -5,7 +14,6 @@
libxinerama-dev.
Be backward-compatible ("... | xlibs-static-dev (<< 6.8.0)").
Also retain an unversioned dependency on xlibs-static-dev for now.
- * Build-depend on gcc-3.4 (build with 4.0 will fail).
* Include the hackers' guide in libxine-dev.
Run the images through pngcrush.
* Re-fix the location of some of the documentation.
@@ -18,6 +26,7 @@
* Various patches dropped since they're not needed with 1.0.2.
* Updated the vdr-xine patch from 0.7.5.
* Pulled in some patches from 1.0.1-1.1.
+ * Temporarily remove libcaca-dev from build-deps for etch.
-- Darren Salt <linux at youmustbejoking.demon.co.uk> Mon, 08 Aug 2005 19:43:57 +0100
Modified: general/xine-lib-vdr/trunk/debian/control
===================================================================
--- general/xine-lib-vdr/trunk/debian/control 2005-10-02 16:38:09 UTC (rev 1373)
+++ general/xine-lib-vdr/trunk/debian/control 2005-10-03 10:44:06 UTC (rev 1374)
@@ -3,14 +3,14 @@
Priority: optional
Maintainer: Siggi Langauf <siggi at debian.org>
Uploaders: Philipp Matthias Hahn <pmhahn at debian.org>
-Build-Depends: debhelper (>= 4.0.4), binutils (>= 2.12.90.0.9), dpatch, aalib1-dev (>= 1.4p5-2) | libaa1-dev, libcaca-dev, xlibs-dev (>> 4.1), libxinerama-dev | xlibs-static-dev (<< 6.8.0), libesd0-dev, zlib1g-dev | libz-dev, libartsc0-dev (>>1.1.0), liblircclient-dev, libogg-dev, libvorbis-dev, libtheora-dev, libasound2-dev, libflac-dev (>>1.1.0), libmodplug-dev, libgnomevfs2-dev, libsmbclient-dev, libspeex-dev, libmng-dev, libpng12-dev | libpng-dev, libfreetype6-dev, libsdl1.2-dev (>=1.1.5), sgmltools-lite, w3m, pngcrush
+Build-Depends: debhelper (>= 4.0.4), binutils (>= 2.12.90.0.9), dpatch, libaa1-dev | aalib1-dev (>= 1.4p5-2), xlibs-dev (>> 4.1), libxinerama-dev | xlibs-static-dev (<< 6.8.0), libesd0-dev, zlib1g-dev | libz-dev, libartsc0-dev (>>1.1.0), liblircclient-dev, libogg-dev, libvorbis-dev, libtheora-dev, libasound2-dev, libflac-dev (>>1.1.0), libmodplug-dev, libgnomevfs2-dev, libsmbclient-dev, libspeex-dev, libmng-dev, libpng12-dev | libpng-dev, libfreetype6-dev, libsdl1.2-dev (>=1.1.5), libdirectfb-dev, sgmltools-lite, w3m, pngcrush
Build-Conflicts: libdvdnav-dev
Standards-Version: 3.6.1
Package: libxine-dev
Architecture: any
Section: libdevel
-Depends: libxine1 (= ${Source-Version}), libc6-dev, xlibs-dev, zlib1g-dev | libz-dev, slang1-dev | slang1-utf8-dev, libfreetype6-dev
+Depends: libxine1 (= ${Source-Version}), libc6-dev, xlibs-dev, zlib1g-dev | libz-dev, libslang2-dev | slang1-dev | slang1-utf8-dev, libfreetype6-dev
Conflicts: xine-ui (<< 0.9.10)
Description: the xine video player library, development packages
This contains development files (headers, documentation and the like)
Modified: general/xine-lib-vdr/trunk/debian/patches/00list
===================================================================
--- general/xine-lib-vdr/trunk/debian/patches/00list 2005-10-02 16:38:09 UTC (rev 1373)
+++ general/xine-lib-vdr/trunk/debian/patches/00list 2005-10-03 10:44:06 UTC (rev 1374)
@@ -3,5 +3,6 @@
02_from_debian
03_vdr-xine_patch
04_log_timestamp
+05_quick_fix_empty_config
10_mrl_ref_ext
99_autoconf
Added: general/xine-lib-vdr/trunk/debian/patches/05_quick_fix_empty_config.dpatch
===================================================================
--- general/xine-lib-vdr/trunk/debian/patches/05_quick_fix_empty_config.dpatch 2005-10-02 16:38:09 UTC (rev 1373)
+++ general/xine-lib-vdr/trunk/debian/patches/05_quick_fix_empty_config.dpatch 2005-10-03 10:44:06 UTC (rev 1374)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_quick_fix_empty_config.dpatch by <ds at flibble.youmustbejoking.demon.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Bug fix: allow configuration saving when the configuration file
+## DP: exists but is empty.
+
+ at DPATCH@
+--- ./src/xine-engine/configfile.c~ 2005-08-21 17:30:13.369128280 +0100
++++ ./src/xine-engine/configfile.c 2005-08-21 17:30:13.369128280 +0100
+@@ -964,7 +964,7 @@
+ f_backup = fopen(temp, "w");
+ f_config = fopen(filename, "r");
+
+- if (f_config && f_backup && (stat(filename, &config_stat) == 0) && (config_stat.st_size > 0)) {
++ if (f_config && f_backup && (stat(filename, &config_stat) == 0)) {
+ char *buf = NULL;
+ size_t rlen;
+
Modified: general/xine-lib-vdr/trunk/debian/rules
===================================================================
--- general/xine-lib-vdr/trunk/debian/rules 2005-10-02 16:38:09 UTC (rev 1373)
+++ general/xine-lib-vdr/trunk/debian/rules 2005-10-03 10:44:06 UTC (rev 1374)
@@ -55,6 +55,8 @@
DEB_BUILD_GNU_OPTION := --build=$(DEB_BUILD_GNU_TYPE)
endif
+DIRECTFB = $(shell test -d /usr/include/directfb && echo --enable-directfb)
+
configure: patch configure-stamp
configure-stamp:
dh_testdir
@@ -62,6 +64,7 @@
# test -f $(CURDIR)/src/input/vcd/libcdio/MSWindows/win32_ioctl.c || \
# ln -s ioctl.c $(CURDIR)/src/input/vcd/libcdio/MSWindows/win32_ioctl.c
./configure --prefix=/usr --mandir=\$${prefix}/share/man \
+ $(DIRECTFB) \
$(DEB_BUILD_GNU_OPTION) CFLAGS="$(CFLAGS)"
touch configure-stamp
More information about the pkg-vdr-dvb-changes
mailing list