[Archvdr-devel] SF.net SVN: archvdr:[220] trunk/archvdr
Brought to you by:
huceke
Menu
▾
▴
[Archvdr-devel] SF.net SVN: archvdr:[220] trunk/archvdr
|
From: <hu...@us...> - 2009-05-28 15:07:59
|
Revision: 220
http://archvdr.svn.sourceforge.net/archvdr/?rev=220&view=rev
Author: huceke
Date: 2009-05-28 15:07:53 +0000 (Thu, 28 May 2009)
Log Message:
-----------
Transition to gcc 4.3 and some minor fixes.
Modified Paths:
--------------
trunk/archvdr/hlcut/PKGBUILD
trunk/archvdr/jammlib/PKGBUILD
trunk/archvdr/lsupnp/PKGBUILD
trunk/archvdr/mjpegtools-yacoto/PKGBUILD
trunk/archvdr/mplayer-vdpau-nogui/PKGBUILD
trunk/archvdr/platinum-upnp/PKGBUILD
trunk/archvdr/replex-yacoto/PKGBUILD
trunk/archvdr/ttf-vdrsymbols/PKGBUILD
trunk/archvdr/vdr-1.7.0/PKGBUILD
trunk/archvdr/vdr-1.7.0-ext/PKGBUILD
trunk/archvdr/vdr-1.7.5/PKGBUILD
trunk/archvdr/vdr-1.7.5/files/Make.config
trunk/archvdr/vdr-1.7.5/files/ctvdrwrapper
trunk/archvdr/vdr-1.7.5/files/vdr-shutdown.wrapper
trunk/archvdr/vdr-1.7.5/patches/00list
trunk/archvdr/vdr-1.7.7-ext/PKGBUILD
trunk/archvdr/vdr-1.7.7-ext/files/Make.config
trunk/archvdr/vdr-1.7.7-ext/files/ctvdrwrapper
trunk/archvdr/vdr-1.7.7-ext/files/vdr-shutdown.wrapper
trunk/archvdr/vdr-addon-noad/PKGBUILD
trunk/archvdr/vdr-genindex/PKGBUILD
trunk/archvdr/vdr-plugin-burn/PKGBUILD
trunk/archvdr/vdr-plugin-console/PKGBUILD
trunk/archvdr/vdr-plugin-control/PKGBUILD
trunk/archvdr/vdr-plugin-devstatus/PKGBUILD
trunk/archvdr/vdr-plugin-director/PKGBUILD
trunk/archvdr/vdr-plugin-dummydevice/PKGBUILD
trunk/archvdr/vdr-plugin-dvd/PKGBUILD
trunk/archvdr/vdr-plugin-dvdswitch/PKGBUILD
trunk/archvdr/vdr-plugin-epgsearch/PKGBUILD
trunk/archvdr/vdr-plugin-extrecmenu/PKGBUILD
trunk/archvdr/vdr-plugin-femon/PKGBUILD
trunk/archvdr/vdr-plugin-filebrowser/PKGBUILD
trunk/archvdr/vdr-plugin-infosatepg/PKGBUILD
trunk/archvdr/vdr-plugin-live/PKGBUILD
trunk/archvdr/vdr-plugin-live-git/PKGBUILD
trunk/archvdr/vdr-plugin-mailbox/PKGBUILD
trunk/archvdr/vdr-plugin-menuorg/PKGBUILD
trunk/archvdr/vdr-plugin-mlist/PKGBUILD
trunk/archvdr/vdr-plugin-osdteletext/PKGBUILD
trunk/archvdr/vdr-plugin-premiereepg/PKGBUILD
trunk/archvdr/vdr-plugin-radiolist/PKGBUILD
trunk/archvdr/vdr-plugin-reelchannelscan/PKGBUILD
trunk/archvdr/vdr-plugin-remote/PKGBUILD
trunk/archvdr/vdr-plugin-rockantenne/PKGBUILD
trunk/archvdr/vdr-plugin-rssreader/PKGBUILD
trunk/archvdr/vdr-plugin-skinenigmang/PKGBUILD
trunk/archvdr/vdr-plugin-skinsoppalusikka/PKGBUILD
trunk/archvdr/vdr-plugin-streamdev-server/PKGBUILD
trunk/archvdr/vdr-plugin-systeminfo/PKGBUILD
trunk/archvdr/vdr-plugin-timeline/PKGBUILD
trunk/archvdr/vdr-plugin-trayopen/PKGBUILD
trunk/archvdr/vdr-plugin-undelete/PKGBUILD
trunk/archvdr/vdr-plugin-upnp/PKGBUILD
trunk/archvdr/vdr-plugin-wirbelscan/PKGBUILD
trunk/archvdr/vdr-plugin-xine/PKGBUILD
trunk/archvdr/vdr-plugin-xineliboutput/PKGBUILD
trunk/archvdr/vdr-plugin-xineliboutput-cvs/PKGBUILD
trunk/archvdr/vdr-plugin-yacoto/PKGBUILD
trunk/archvdr/vdr-sysinfo/PKGBUILD
trunk/archvdr/xine-lib-vdpau/PKGBUILD
trunk/archvdr/xine-lib-vdpau-1.2/PKGBUILD
trunk/archvdr/xine-ui-vdr/PKGBUILD
trunk/archvdr/xine-ui-vdr-cvs/PKGBUILD
Added Paths:
-----------
trunk/archvdr/cxxtools/
trunk/archvdr/cxxtools/PKGBUILD
trunk/archvdr/tntnet/
trunk/archvdr/tntnet/PKGBUILD
trunk/archvdr/tntnet/gcc-4.3-compat.diff
trunk/archvdr/vdr-1.7.5/patches/fix_includes.dpatch
trunk/archvdr/vdr-plugin-filebrowser/glibc_fixes.patch
Removed Paths:
-------------
trunk/archvdr/vdr-plugin-epgsearch/gcc_4.4.patch
trunk/archvdr/vdr-plugin-filebrowser/gcc_4.4.patch
trunk/archvdr/vdr-plugin-xineliboutput/gcc_4.4.patch
trunk/archvdr/vdr-plugin-xineliboutput-cvs/gcc_4.4.patch
Added: trunk/archvdr/cxxtools/PKGBUILD
===================================================================
--- trunk/archvdr/cxxtools/PKGBUILD (rev 0)
+++ trunk/archvdr/cxxtools/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -0,0 +1,23 @@
+# Maintainer : <gimli at dark-green dot com>
+# Contributor: Jan Willies <ja...@wi...>
+
+pkgname="cxxtools"
+pkgver="1.4.8"
+pkgrel="2"
+pkgdesc="Cxxtools is a collection of general-purpose C++ classes"
+url="http://www.tntnet.org/cxxtools.hms"
+license=("LGPL")
+arch=("i686" "x86_64")
+source=(http://www.tntnet.org/download/$pkgname-$pkgver.tar.gz)
+md5sums=('16ce92a83beb925fa5138fc9a52d55af')
+depends=('gcc-libs' 'gcc43')
+makedepends=('gcc43')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ CXX=g++-4.3 CC=gcc-4.3 ./configure --prefix=/usr
+ make || return 1
+ make DESTDIR="$pkgdir" install
+}
+
Modified: trunk/archvdr/hlcut/PKGBUILD
===================================================================
--- trunk/archvdr/hlcut/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/hlcut/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -8,7 +8,7 @@
url="http://www.metzlerbros.org/"
license=('GPL')
groups=()
-depends=()
+depends=('gcc43')
source=(http://www.htpc-forum.de/download/$pkgname.tgz
hlcut-stdlib.diff)
md5sums=('b61d91e8ce3fead17ed227b9a9466dd3'
@@ -20,7 +20,7 @@
patch -p1 -i ../hlcut-stdlib.diff || return 1
make clean || return 1
- make || return 1
+ make CXX=g++-4.3 || return 1
make BINDIR=$pkgdir/usr/bin install || return 1
}
Modified: trunk/archvdr/jammlib/PKGBUILD
===================================================================
--- trunk/archvdr/jammlib/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/jammlib/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -7,8 +7,8 @@
pkgdesc="JammLib Basic functionality used by the other Jamm components"
url="http://hakker.de/jamm"
license="GPL"
-makedepends=('cmake')
-depends=()
+makedepends=('cmake' 'gcc43')
+depends=('gcc43')
backup=()
source=(http://hakker.de/files/${pkgname}-${pkgver}.tar.bz2)
md5sums=()
@@ -18,8 +18,8 @@
cd ${srcdir}/${pkgname}
- cmake .
- make
+ CXX=g++-4.3 CPP=gcc-4.3 cmake .
+ CXX=g++-4.3 CPP=gcc-4.3 make
make DESTDIR=${pkgdir} install
}
Modified: trunk/archvdr/lsupnp/PKGBUILD
===================================================================
--- trunk/archvdr/lsupnp/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/lsupnp/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -7,8 +7,8 @@
pkgdesc="lsupnp - tracks UPnP devices and their status variables"
url="http://hakker.de/jamm"
license="GPL"
-makedepends=('cmake' 'jammlib')
-depends=('jammlib')
+makedepends=('cmake' 'jammlib' 'platinum-upnp')
+depends=('jammlib' 'platinum-upnp')
backup=()
source=(http://hakker.de/files/${pkgname}-${pkgver}.tar.bz2)
md5sums=()
@@ -18,7 +18,7 @@
cd ${srcdir}/${pkgname}
- cmake .
+ CXX=g++-4.3 CC=gcc-4.3 cmake .
make
mkdir -p ${pkgdir}/usr/bin
Modified: trunk/archvdr/mjpegtools-yacoto/PKGBUILD
===================================================================
--- trunk/archvdr/mjpegtools-yacoto/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/mjpegtools-yacoto/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -10,7 +10,7 @@
url="http://mjpeg.sourceforge.net/"
replaces=('mjpegtools')
provides=('mjpegtools')
-depends=('libjpeg' 'libpng' 'sdl' 'gcc' 'libdv')
+depends=('libjpeg' 'libpng' 'sdl' 'gcc43' 'libdv')
makedepends=('gtk2')
options=('!makeflags' '!libtool')
source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${_pkgname}-${pkgver}.tar.gz)
@@ -18,7 +18,7 @@
build() {
cd ${startdir}/src/${_pkgname}-${pkgver}
- ./configure --prefix=/usr
+ CXX=g++-4.3 CC=gcc-4.3 ./configure --prefix=/usr
if [ "$CARCH" = "i686" ]; then
find -name Makefile -exec sed -i -e 's:-march=k8 -mtune=k8::' -e 's:-march=pentium3 -mtune=pentium3::' {} \;
Modified: trunk/archvdr/mplayer-vdpau-nogui/PKGBUILD
===================================================================
--- trunk/archvdr/mplayer-vdpau-nogui/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/mplayer-vdpau-nogui/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -10,7 +10,7 @@
arch=('i686' 'x86_64')
url="http://www.mplayerhq.hu/"
license=('GPL')
-depends=('ttf-dejavu' 'nvidia-beta' 'libxxf86dga' 'libxv' 'libmad' 'giflib' 'cdparanoia'
+depends=('ttf-dejavu' 'nvidia-utils-beta' 'libxxf86dga' 'libxv' 'libmad' 'giflib' 'cdparanoia'
'sdl' 'lame' 'libtheora' 'xvidcore' 'zlib' 'libmng' 'libxss'
'smbclient' 'aalib' 'jack-audio-connection-kit'
'faac' 'lirc-utils' 'fribidi' 'enca')
@@ -35,7 +35,7 @@
svn co -r $dvdread4ver svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread/src libdvdread4
svn co -r $dvdnavver svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav/src libdvdnav
- ./configure --prefix=/usr --disable-gui --disable-arts --enable-x11 \
+ CXX=g++-4.3 CC=gcc-4.3 ./configure --prefix=/usr --disable-gui --disable-arts --enable-x11 \
--enable-runtime-cpudetection --confdir=/etc/mplayer --disable-nas \
--enable-gl --enable-tv-v4l1 --enable-tv-v4l2 --enable-largefiles \
--disable-liblzo --disable-speex --disable-openal \
Modified: trunk/archvdr/platinum-upnp/PKGBUILD
===================================================================
--- trunk/archvdr/platinum-upnp/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/platinum-upnp/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -18,7 +18,7 @@
cd ${srcdir}/Platinum
- cmake .
+ CXX=g++-4.3 CC=gcc-4.3 cmake .
make DESTDIR=${pkgdir} install
Modified: trunk/archvdr/replex-yacoto/PKGBUILD
===================================================================
--- trunk/archvdr/replex-yacoto/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/replex-yacoto/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -27,7 +27,7 @@
cd $startdir/src/replex-$pkgver
sed -e 's/\-m32//g' -i Makefile
cat $startdir/replex-0.1.6.8-yacoto.diff |patch -p1
- make || return 1
+ CXX=g++-4.3 CC=gcc-4.3 make || return 1
make DESTDIR=$startdir/pkg install
# fi
Added: trunk/archvdr/tntnet/PKGBUILD
===================================================================
--- trunk/archvdr/tntnet/PKGBUILD (rev 0)
+++ trunk/archvdr/tntnet/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -0,0 +1,29 @@
+# Contributor: Jan Willies <ja...@wi...>
+
+pkgname="tntnet"
+pkgver="1.6.3"
+pkgrel="2"
+pkgdesc="Tntnet is a modular, multithreaded, high performance webapplicationserver for C++"
+url="http://www.tntnet.org/index.hms"
+license=("LGPL")
+arch=("i686" "x86_64")
+source=(http://www.tntnet.org/download/$pkgname-$pkgver.tar.gz
+ gcc-4.3-compat.diff)
+md5sums=('8db3bfcc4b32c1eef92a9685fe4a969d'
+ '49404d547781ac1a2ce0de66810c1004')
+depends=('cxxtools' 'zip' 'gnutls' 'gcc43')
+makedepends=('gcc43')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ patch -uN sdk/tools/ecppc/scopevar.cpp ../gcc-4.3-compat.diff
+
+ CXX=g++-4.3 CC=gcc-4.3 ./configure --prefix=/usr --sysconfdir=/etc
+ make || return 1
+ make DESTDIR="$pkgdir" install
+
+ install -Dm755 $startdir/src/$pkgname-$pkgver/etc/init.d/tntnet ${startdir}/pkg/etc/rc.d/tntnet
+ rm -rf ${startdir}/pkg/etc/init.d/
+}
+
Added: trunk/archvdr/tntnet/gcc-4.3-compat.diff
===================================================================
--- trunk/archvdr/tntnet/gcc-4.3-compat.diff (rev 0)
+++ trunk/archvdr/tntnet/gcc-4.3-compat.diff 2009-05-28 15:07:53 UTC (rev 220)
@@ -0,0 +1,10 @@
+--- tntnet-1.6.3.orig/sdk/tools/ecppc/scopevar.cpp 2008-06-01 22:47:40.000000000 +0200
++++ tntnet-1.6.3/sdk/tools/ecppc/scopevar.cpp 2008-06-16 17:05:48.429925428 +0200
+@@ -22,6 +22,7 @@
+ #include <tnt/stringescaper.h>
+ #include <iterator>
+ #include <iostream>
++#include <algorithm>
+
+ namespace tnt
+ {
Modified: trunk/archvdr/ttf-vdrsymbols/PKGBUILD
===================================================================
--- trunk/archvdr/ttf-vdrsymbols/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/ttf-vdrsymbols/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -9,7 +9,7 @@
arch=('i686' 'x86_64')
url="http://andreas.vdr-developer.org/fonts/"
license=('Public domain')
-depends=('fontconfig')
+depends=('fontconfig' 'xorg-font-utils')
install=ttf-vdrsymbols.install
source=(http://andreas.vdr-developer.org/fonts/download/${_basename}-ttf-$pkgver.tgz)
md5sums=('1f5bd50b085a92a726598db28eef2836')
Modified: trunk/archvdr/vdr-1.7.0/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-1.7.0/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-1.7.0/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -12,7 +12,7 @@
license=(GPL)
pkgdesc=""
depends=('libjpeg' 'libcap' 'fontconfig' 'freetype2' 'gettext' 'gcc-libs' 'dash'
- 'sudo' 'ttf-vdrsymbols' 's2-liplianin-hg' 'start-stop-daemon' 'gcc43')
+ 'sudo' 'ttf-vdrsymbols' 'start-stop-daemon' 'gcc43')
makedepends=('fakeroot' 'gcc' 'gcc43')
optdepends=('vdr-addon-acpiwakeup')
install=$pkgname.install
@@ -50,12 +50,10 @@
echo "DEFINES += -DUSE_PARENTALRATING" >> Make.config
make all REMOTE=LIRC CONFDIR=/var/lib/vdr LOCDIR=/usr/share/locale \
- VIDEODIR=/var/lib/video.00 PLUGINLIBDIR=/usr/lib/vdr/plugins \
- DVBDIR=/usr/src/s2-headers/linux || return 1
+ VIDEODIR=/var/lib/video.00 PLUGINLIBDIR=/usr/lib/vdr/plugins || return 1
make plugins REMOTE=LIRC CONFDIR=/var/lib/vdr LOCDIR=/usr/share/locale \
- VIDEODIR=/var/lib/video.00 PLUGINLIBDIR=/usr/lib/vdr/plugins \
- DVBDIR=/usr/src/s2-headers/linux || return 1
+ VIDEODIR=/var/lib/video.00 PLUGINLIBDIR=/usr/lib/vdr/plugins || return 1
gcc -o ${startdir}/files/vdr-shutdown.wrapper ${startdir}/files/vdr-shutdown-wrapper.c
gcc -o ${startdir}/files/ctvdrwrapper ${startdir}/files/ctvdrwrapper.c
Modified: trunk/archvdr/vdr-1.7.0-ext/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-1.7.0-ext/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-1.7.0-ext/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -13,7 +13,7 @@
license=(GPL)
pkgdesc=""
depends=('libjpeg' 'libcap' 'fontconfig' 'freetype2' 'gettext' 'gcc-libs' 'dash'
- 'sudo' 'ttf-vdrsymbols' 's2-liplianin-hg' 'start-stop-daemon' 'gcc43')
+ 'sudo' 'ttf-vdrsymbols' 'start-stop-daemon' 'gcc43')
makedepends=('fakeroot' 'gcc43')
optdepends=('vdr-addon-acpiwakeup')
install=$pkgname.install
Modified: trunk/archvdr/vdr-1.7.5/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-1.7.5/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-1.7.5/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -12,8 +12,8 @@
license=(GPL)
pkgdesc=""
depends=('libjpeg' 'libcap' 'fontconfig' 'freetype2' 'gettext' 'gcc-libs' 'dash'
- 'sudo' 'ttf-vdrsymbols' 's2-liplianin-hg' 'start-stop-daemon')
-makedepends=('fakeroot' 'gcc')
+ 'sudo' 'ttf-vdrsymbols' 'start-stop-daemon')
+makedepends=('fakeroot' 'gcc' 'gcc43')
optdepends=('vdr-addon-acpiwakeup')
install=$pkgname.install
source=(ftp://ftp.cadsoft.de/vdr/Developer/vdr-${pkgver}.tar.bz2)
@@ -50,12 +50,10 @@
echo "DEFINES += -DUSE_PARENTALRATING" >> Make.config
make all REMOTE=LIRC CONFDIR=/var/lib/vdr LOCDIR=/usr/share/locale \
- VIDEODIR=/var/lib/video.00 PLUGINLIBDIR=/usr/lib/vdr/plugins \
- DVBDIR=/usr/src/s2-headers/linux || return 1
+ VIDEODIR=/var/lib/video.00 PLUGINLIBDIR=/usr/lib/vdr/plugins || return 1
make plugins REMOTE=LIRC CONFDIR=/var/lib/vdr LOCDIR=/usr/share/locale \
- VIDEODIR=/var/lib/video.00 PLUGINLIBDIR=/usr/lib/vdr/plugins \
- DVBDIR=/usr/src/s2-headers/linux || return 1
+ VIDEODIR=/var/lib/video.00 PLUGINLIBDIR=/usr/lib/vdr/plugins || return 1
gcc -o ${startdir}/files/vdr-shutdown.wrapper ${startdir}/files/vdr-shutdown-wrapper.c
gcc -o ${startdir}/files/ctvdrwrapper ${startdir}/files/ctvdrwrapper.c
Modified: trunk/archvdr/vdr-1.7.5/files/Make.config
===================================================================
--- trunk/archvdr/vdr-1.7.5/files/Make.config 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-1.7.5/files/Make.config 2009-05-28 15:07:53 UTC (rev 220)
@@ -10,10 +10,10 @@
### The C compiler and options:
-CC = gcc
+CC = gcc-4.3
CFLAGS += -O2 -Wall
-CXX = g++
+CXX = g++-4.3
CXXFLAGS += -O2 -Wall -Woverloaded-virtual -Wno-parentheses
ifdef PLUGIN
Modified: trunk/archvdr/vdr-1.7.5/files/ctvdrwrapper
===================================================================
(Binary files differ)
Modified: trunk/archvdr/vdr-1.7.5/files/vdr-shutdown.wrapper
===================================================================
(Binary files differ)
Modified: trunk/archvdr/vdr-1.7.5/patches/00list
===================================================================
--- trunk/archvdr/vdr-1.7.5/patches/00list 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-1.7.5/patches/00list 2009-05-28 15:07:53 UTC (rev 220)
@@ -22,3 +22,5 @@
vdr-jumpplay-1.0-1.7.5
cuttime-vdr-1.7.3
vdr-1.7.5-dd
+
+fix_includes
Added: trunk/archvdr/vdr-1.7.5/patches/fix_includes.dpatch
===================================================================
--- trunk/archvdr/vdr-1.7.5/patches/fix_includes.dpatch (rev 0)
+++ trunk/archvdr/vdr-1.7.5/patches/fix_includes.dpatch 2009-05-28 15:07:53 UTC (rev 220)
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 99_dvb-header-fixes.dpatch by Tobias Grimm <et...@de...>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This is a workaround for some trouble with the kernel headers
+## DP: in Linux 2.6.29.
+## DP: See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=523424
+
+@DPATCH@
+diff -urNad vdr-1.7.4~/dvbdevice.c vdr-1.7.4/dvbdevice.c
+--- vdr-1.7.4~/dvbdevice.c 2009-01-10 11:07:33.000000000 +0100
++++ vdr-1.7.4/dvbdevice.c 2009-04-11 13:50:01.000000000 +0200
+@@ -7,6 +7,8 @@
+ * $Id: dvbdevice.c 2.12 2009/01/10 10:07:33 kls Exp $
+ */
+
++#include <sys/ioctl.h>
++#include <sys/mman.h>
+ #include "dvbdevice.h"
+ #include <errno.h>
+ #include <limits.h>
+@@ -15,8 +17,6 @@
+ #include <linux/dvb/dmx.h>
+ #include <linux/dvb/frontend.h>
+ #include <linux/dvb/video.h>
+-#include <sys/ioctl.h>
+-#include <sys/mman.h>
+ #include "channels.h"
+ #include "diseqc.h"
+ #include "dvbci.h"
+diff -urNad vdr-1.7.4~/dvbdevice.h vdr-1.7.4/dvbdevice.h
+--- vdr-1.7.4~/dvbdevice.h 2008-12-06 14:31:12.000000000 +0100
++++ vdr-1.7.4/dvbdevice.h 2009-04-11 13:50:10.000000000 +0200
+@@ -10,6 +10,7 @@
+ #ifndef __DVBDEVICE_H
+ #define __DVBDEVICE_H
+
++#include <asm/types.h>
+ #include <linux/dvb/frontend.h>
+ #include <linux/dvb/version.h>
+ #include "device.h"
+
Modified: trunk/archvdr/vdr-1.7.7-ext/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-1.7.7-ext/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-1.7.7-ext/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -13,8 +13,8 @@
license=(GPL)
pkgdesc=""
depends=('libjpeg' 'libcap' 'fontconfig' 'freetype2' 'gettext' 'gcc-libs' 'dash'
- 'sudo' 'ttf-vdrsymbols' 's2-liplianin-hg' 'start-stop-daemon')
-makedepends=('fakeroot' 'gcc')
+ 'sudo' 'ttf-vdrsymbols' 'start-stop-daemon')
+makedepends=('fakeroot' 'gcc43')
optdepends=('vdr-addon-acpiwakeup')
install=$pkgname.install
source=(ftp://ftp.cadsoft.de/vdr/Developer/vdr-${pkgver}.tar.bz2
@@ -49,12 +49,10 @@
echo "DEFINES += -D__KERNEL_STRICT_NAMES" >> Make.config
make all REMOTE=LIRC CONFDIR=/var/lib/vdr LOCDIR=/usr/share/locale \
- VIDEODIR=/var/lib/video.00 PLUGINLIBDIR=/usr/lib/vdr/plugins \
- DVBDIR=/usr/src/s2-headers/linux || return 1
+ VIDEODIR=/var/lib/video.00 PLUGINLIBDIR=/usr/lib/vdr/plugins || return 1
make plugins REMOTE=LIRC CONFDIR=/var/lib/vdr LOCDIR=/usr/share/locale \
- VIDEODIR=/var/lib/video.00 PLUGINLIBDIR=/usr/lib/vdr/plugins \
- DVBDIR=/usr/src/s2-headers/linux || return 1
+ VIDEODIR=/var/lib/video.00 PLUGINLIBDIR=/usr/lib/vdr/plugins || return 1
gcc -o ${startdir}/files/vdr-shutdown.wrapper ${startdir}/files/vdr-shutdown-wrapper.c
gcc -o ${startdir}/files/ctvdrwrapper ${startdir}/files/ctvdrwrapper.c
Modified: trunk/archvdr/vdr-1.7.7-ext/files/Make.config
===================================================================
--- trunk/archvdr/vdr-1.7.7-ext/files/Make.config 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-1.7.7-ext/files/Make.config 2009-05-28 15:07:53 UTC (rev 220)
@@ -10,10 +10,10 @@
### The C compiler and options:
-CC = gcc
+CC = gcc-4.3
CFLAGS += -O2 -Wall
-CXX = g++
+CXX = g++-4.3
CXXFLAGS += -O2 -Wall -Woverloaded-virtual -Wno-parentheses
ifdef PLUGIN
Modified: trunk/archvdr/vdr-1.7.7-ext/files/ctvdrwrapper
===================================================================
(Binary files differ)
Modified: trunk/archvdr/vdr-1.7.7-ext/files/vdr-shutdown.wrapper
===================================================================
(Binary files differ)
Modified: trunk/archvdr/vdr-addon-noad/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-addon-noad/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-addon-noad/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -27,7 +27,7 @@
cd $srcdir/$_gitrepo
- ./configure --prefix=/usr
+ CXX=g++-4.3 CC=gcc-4.3 ./configure --prefix=/usr
make || return 1
mkdir -p $pkgdir/usr/bin || return 1
Modified: trunk/archvdr/vdr-genindex/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-genindex/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-genindex/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -18,7 +18,7 @@
cd ${srcdir}/$_pkgname-${pkgver}
- make || return 1
+ CXX=g++-4.3 CC=gcc-4.3 make || return 1
mkdir -p $pkgdir/usr/bin || return 1
install -m 755 genindex $pkgdir/usr/bin || return 1
Modified: trunk/archvdr/vdr-plugin-burn/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-burn/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-burn/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -56,12 +56,12 @@
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
- make VDRDIR=/usr/include/vdr \
+ make VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
LOCALEDIR="$startdir/pkg/usr/share/locale/" \
TMPDIR=/var/cache/vdr-plugin-burn ISODIR=/video/iso all || return 1
- sed -e 's/getline/getline_/g' -i ${srcdir}/$_pkgname-${pkgver}-pre21/debian/pxsup2dast.c || return 1
+ sed -e 's/getline/getline_/g' -i ${srcdir}/$_pkgname-${pkgver}-pre21/debian/pxsup2dast.c || return 1
cd ${srcdir}/$_pkgname-${pkgver}-pre21/debian; /bin/sh pxsup2dast.c || return 1
cd ${srcdir}/$_pkgname-${pkgver}-pre21 || return 1
Modified: trunk/archvdr/vdr-plugin-console/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-console/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-console/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -36,10 +36,9 @@
mkdir -p $pkgdir/usr/lib/vdr/plugins/ || return 1
- make VDRDIR=/usr/include/vdr \
+ make VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
- LOCALEDIR="$startdir/pkg/usr/share/locale/" \
- DVBDIR=/usr/src/s2-headers/linux all || return 1
+ LOCALEDIR="$startdir/pkg/usr/share/locale/" || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
install -m 755 libvdr-*.so.* $pkgdir/usr/lib/vdr/plugins/ || return 1
Modified: trunk/archvdr/vdr-plugin-control/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-control/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-control/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -24,8 +24,6 @@
cd ${srcdir}/$_pkgname-${pkgver}
- sed -e 's/strchr(/strchr((char *)/g' -i *.c
-
patch -p1 -i $startdir/patches/01_Makefile-fPIC-fix.dpatch || return 1
patch -p1 -i $startdir/patches/02_gateway.dpatch || return 1
@@ -33,10 +31,9 @@
patch -p1 -i $startdir/patches/92_control-1.3.18.dpatch || return 1
patch -p1 -i $startdir/patches/93_control-0.0.2a-1.5.0.dpatch || return 1
- make VDRDIR=/usr/include/vdr \
+ make VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
- LOCALEDIR="$startdir/pkg/usr/share/locale/" \
- DVBDIR=/usr/src/s2-headers/linux all || return 1
+ LOCALEDIR="$startdir/pkg/usr/share/locale/" || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
install -m 755 libvdr-*.so.* $pkgdir/usr/lib/vdr/plugins/ || return 1
Modified: trunk/archvdr/vdr-plugin-devstatus/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-devstatus/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-devstatus/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -22,10 +22,9 @@
mkdir -p $pkgdir/usr/lib/vdr/plugins/ || return 1
- make VDRDIR=/usr/include/vdr \
+ make VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
- LOCALEDIR="$startdir/pkg/usr/share/locale/" \
- DVBDIR=/usr/src/s2-headers/linux all || return 1
+ LOCALEDIR="$startdir/pkg/usr/share/locale/" all || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
install -m 755 libvdr-*.so.* $pkgdir/usr/lib/vdr/plugins/ || return 1
Modified: trunk/archvdr/vdr-plugin-director/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-director/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-director/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -29,10 +29,9 @@
mkdir -p $pkgdir/usr/lib/vdr/plugins/ || return 1
- make VDRDIR=/usr/include/vdr \
+ make VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
- LOCALEDIR="$startdir/pkg/usr/share/locale/" \
- DVBDIR=/usr/src/s2-headers/linux all || return 1
+ LOCALEDIR="$startdir/pkg/usr/share/locale/" all || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
install -m 755 libvdr-*.so.* $pkgdir/usr/lib/vdr/plugins/ || return 1
Modified: trunk/archvdr/vdr-plugin-dummydevice/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-dummydevice/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-dummydevice/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -20,10 +20,9 @@
cd ${srcdir}/$_packagename-${pkgver}
- make VDRDIR=/usr/include/vdr \
+ make VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
- LOCALEDIR="$startdir/pkg/usr/share/locale/" \
- DVBDIR=/usr/src/s2-headers/linux all || return 1
+ LOCALEDIR="$startdir/pkg/usr/share/locale/" all || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
install -m 755 libvdr-*.so.* $pkgdir/usr/lib/vdr/plugins/ || return 1
Modified: trunk/archvdr/vdr-plugin-dvd/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-dvd/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-dvd/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -41,7 +41,7 @@
sed -i -e 's|fprintf(stderr, "arg: %s\n", optarg);|// fprintf(stderr, "arg: %s\n", optarg);|' \
dvd.c || return 1
- make VDRDIR="/usr/include/vdr" INCLUDES="-I/usr/include/vdr" LIBDIR="." \
+ make VDRDIR="/usr/include/vdr" INCLUDES="-I/usr/include/vdr" LIBDIR="." CXX=g++-4.3 \
LOCALEDIR="$pkgdir/usr/share/locale" all || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
Modified: trunk/archvdr/vdr-plugin-dvdswitch/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-dvdswitch/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-dvdswitch/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -32,10 +32,9 @@
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
- make VDRDIR=/usr/include/vdr \
+ make VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
- LOCALEDIR="$startdir/pkg/usr/share/locale/" \
- DVBDIR=/usr/src/s2-headers/linux all || return 1
+ LOCALEDIR="$startdir/pkg/usr/share/locale/" all || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
install -m 755 libvdr-*.so.* $pkgdir/usr/lib/vdr/plugins/ || return 1
Modified: trunk/archvdr/vdr-plugin-epgsearch/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-epgsearch/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-epgsearch/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -15,8 +15,7 @@
'etc/vdr/plugins/epgsearch/epgsearchmenu.conf'
'etc/vdr/plugins/epgsearch/epgsearchcats.conf')
source=(http://winni.vdr-developer.org/epgsearch/downloads/beta/vdr-$_pluginname-$pkgver.tgz
- 01_debian-defaults.dpatch
- gcc_4.4.patch)
+ 01_debian-defaults.dpatch)
md5sums=('9b9db1a39a6d184c788db5bc9ff5861f'
'25f21df320e3d508b03a33d30eea0b29')
@@ -24,9 +23,8 @@
cd "$srcdir/${_pluginname}-$pkgver"
patch -p1 -i ../01_debian-defaults.dpatch || return 1
- patch -p1 -i ../gcc_4.4.patch || return 1
- make HAVE_PCREPOSIX=1 MANDIR="$pkgdir/usr/man" \
+ make HAVE_PCREPOSIX=1 MANDIR="$pkgdir/usr/man" CXX=g++-4.3 \
VDRDIR="/usr/include/vdr" INCLUDES="-I/usr/include/vdr" LIBDIR="." \
LOCALEDIR="$pkgdir/usr/share/locale" all install-doc || return 1
Deleted: trunk/archvdr/vdr-plugin-epgsearch/gcc_4.4.patch
===================================================================
--- trunk/archvdr/vdr-plugin-epgsearch/gcc_4.4.patch 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-epgsearch/gcc_4.4.patch 2009-05-28 15:07:53 UTC (rev 220)
@@ -1,46 +0,0 @@
---- epgsearch-0.9.25.beta13-orig/epgsearchsvdrp.c 2009-05-27 18:15:18.000000000 +0200
-+++ epgsearch-0.9.25.beta13/epgsearchsvdrp.c 2009-05-27 18:16:17.000000000 +0200
-@@ -763,7 +763,7 @@
- {
- if (*Option)
- {
-- char* pipePos = strchr(Option, '|');
-+ char* pipePos = strchr((char *)Option, '|');
- if (pipePos)
- {
- *pipePos = 0;
---- epgsearch-0.9.25.beta13-orig/epgsearchtools.c 2009-05-27 18:19:08.000000000 +0200
-+++ epgsearch-0.9.25.beta13/epgsearchtools.c 2009-05-27 18:19:31.000000000 +0200
-@@ -746,7 +746,7 @@
- while(tmp)
- {
- // extract a single line
-- char* lf = strchr(tmp, '\n');
-+ char* lf = strchr((char *)tmp, '\n');
- char* line = NULL;
- if (lf)
- line = strndup(tmp, lf-tmp);
---- epgsearch-0.9.25.beta13-orig/menu_dirselect.c 2009-05-27 18:23:43.000000000 +0200
-+++ epgsearch-0.9.25.beta13/menu_dirselect.c 2009-05-27 18:24:02.000000000 +0200
-@@ -83,7 +83,7 @@
- return 1;
- do
- {
-- char* pos = strchr(szDir, '~');
-+ char* pos = strchr((char *)szDir, '~');
- if (pos)
- {
- iLevel++;
---- epgsearch-0.9.25.beta13-orig/searchtimer_thread.c 2009-05-27 18:28:03.000000000 +0200
-+++ epgsearch-0.9.25.beta13/searchtimer_thread.c 2009-05-27 18:29:09.000000000 +0200
-@@ -599,8 +599,8 @@
- if (!isempty(aux))
- {
- tmpaux = strdup(aux);
-- char* begin = strstr(aux, "<epgsearch>");
-- char* end = strstr(aux, "</epgsearch>");
-+ char* begin = strstr((char *)aux, "<epgsearch>");
-+ char* end = strstr((char *)aux, "</epgsearch>");
- if (begin && end)
- {
- if (begin == aux) strcpy(tmpaux, ""); else strn0cpy(tmpaux, aux, begin-aux+1);
Modified: trunk/archvdr/vdr-plugin-extrecmenu/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-extrecmenu/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-extrecmenu/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -26,15 +26,11 @@
patch -p1 -i debian/patches/01_dvdarchive-path.dpatch || return 1
patch -p1 -i ../i18.patch || return 1
- sed -e 's/strchr(/strchr((char *)/g' -i *.c
- sed -e 's/strrchr(/strrchr((char *)/g' -i *.c
-
mkdir -p $pkgdir/usr/lib/vdr/plugins/ || return 1
- make VDRDIR=/usr/include/vdr \
+ make VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
- LOCALEDIR="$startdir/pkg/usr/share/locale/" \
- DVBDIR=/usr/src/s2-headers/linux all || return 1
+ LOCALEDIR="$startdir/pkg/usr/share/locale/" all || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
install -m 755 libvdr-*.so.* $pkgdir/usr/lib/vdr/plugins/ || return 1
Modified: trunk/archvdr/vdr-plugin-femon/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-femon/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-femon/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -18,7 +18,7 @@
cd "$startdir/src/${_pluginname}-$pkgver"
- make VDRDIR=/usr/include/vdr LIBDIR=. \
+ make VDRDIR=/usr/include/vdr LIBDIR=. CXX=g++-4.3 \
LOCALEDIR=$pkgdir/usr/share/locale all || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
Modified: trunk/archvdr/vdr-plugin-filebrowser/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-filebrowser/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-filebrowser/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -15,23 +15,22 @@
'etc/vdr/plugins/filebrowser/othercommands.conf'
'etc/vdr/plugins/filebrowser/sources.conf')
source=(http://vdr.nasenbaeren.net/filebrowser/vdr-$_pkgname-$pkgver.tgz
- gcc_4.4.patch)
+ glibc_fixes.patch)
md5sums=('c3600c38eebb45bf225b3b8226da57aa'
- '898d5c5d00b66fad90341fccefdc217e')
+ '28cd599384b4a648bf765cea491e1bb7')
build() {
unset CXXFLAGS
cd ${srcdir}/$_pkgname-${pkgver}
- patch -p1 -i ../gcc_4.4.patch || return 1
+ patch -p1 -i ../glibc_fixes.patch || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins/ || return 1
- make VDRDIR=/usr/include/vdr \
+ make VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
- LOCALEDIR="$startdir/pkg/usr/share/locale/" \
- DVBDIR=/usr/src/s2-headers/linux all || return 1
+ LOCALEDIR="$startdir/pkg/usr/share/locale/" all || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
install -m 755 libvdr-*.so.* $pkgdir/usr/lib/vdr/plugins/ || return 1
Deleted: trunk/archvdr/vdr-plugin-filebrowser/gcc_4.4.patch
===================================================================
--- trunk/archvdr/vdr-plugin-filebrowser/gcc_4.4.patch 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-filebrowser/gcc_4.4.patch 2009-05-28 15:07:53 UTC (rev 220)
@@ -1,117 +0,0 @@
-diff -uNr filebrowser-0.2.0-orig/developers/filebrowserdemo/filebrowserlib/menu-filebrowser.c filebrowser-0.2.0/developers/filebrowserdemo/filebrowserlib/menu-filebrowser.c
---- filebrowser-0.2.0-orig/developers/filebrowserdemo/filebrowserlib/menu-filebrowser.c 2009-05-27 19:26:47.000000000 +0200
-+++ filebrowser-0.2.0/developers/filebrowserdemo/filebrowserlib/menu-filebrowser.c 2009-05-27 19:35:59.000000000 +0200
-@@ -141,12 +141,12 @@
- if ( BaseDirectory ) delete BaseDirectory;
- }
-
--int cOsdMenuFilebrowser::DirectorySort ( const void* File1, const void* File2 )
-+int cOsdMenuFilebrowser::DirectorySort ( const dirent64** File1, const dirent64** File2 )
- {
-
-- struct dirent64* ent1=* ( struct dirent64** ) File1;
-+ const struct dirent64* ent1=*File1;
-
-- struct dirent64* ent2=* ( struct dirent64** ) File2;
-+ const struct dirent64* ent2=*File2;
-
- if ( strcmp ( ent1->d_name, ".." ) == 0 )
- {
-@@ -202,7 +202,7 @@
- {
- if ( * ( Statebag->CurrentDirectory ) )
- {
-- char* slash=strrchr ( * ( Statebag->CurrentDirectory ), '/' );
-+ char* slash=strrchr ( (char *)* ( Statebag->CurrentDirectory ), '/' );
-
- if ( slash )
- {
-diff -uNr filebrowser-0.2.0-orig/developers/filebrowserdemo/filebrowserlib/menu-filebrowser.h filebrowser-0.2.0/developers/filebrowserdemo/filebrowserlib/menu-filebrowser.h
---- filebrowser-0.2.0-orig/developers/filebrowserdemo/filebrowserlib/menu-filebrowser.h 2009-05-27 19:26:47.000000000 +0200
-+++ filebrowser-0.2.0/developers/filebrowserdemo/filebrowserlib/menu-filebrowser.h 2009-05-27 19:34:26.000000000 +0200
-@@ -72,7 +72,7 @@
-
- eMenuFilebrowserTask Task;
-
-- static int DirectorySort(const void* File1, const void* File2);
-+ static int DirectorySort(const dirent64** File1, const dirent64** File2);
- /*
- * This filters entries shown in Filebrowser
- * The function uses Statebag->ShowHiddenFiles and Statebag->Filter
-diff -uNr filebrowser-0.2.0-orig/menu-filebrowser.c filebrowser-0.2.0/menu-filebrowser.c
---- filebrowser-0.2.0-orig/menu-filebrowser.c 2009-05-27 19:26:47.000000000 +0200
-+++ filebrowser-0.2.0/menu-filebrowser.c 2009-05-27 19:35:59.000000000 +0200
-@@ -141,12 +141,12 @@
- if ( BaseDirectory ) delete BaseDirectory;
- }
-
--int cOsdMenuFilebrowser::DirectorySort ( const void* File1, const void* File2 )
-+int cOsdMenuFilebrowser::DirectorySort ( const dirent64** File1, const dirent64** File2 )
- {
-
-- struct dirent64* ent1=* ( struct dirent64** ) File1;
-+ const struct dirent64* ent1=*File1;
-
-- struct dirent64* ent2=* ( struct dirent64** ) File2;
-+ const struct dirent64* ent2=*File2;
-
- if ( strcmp ( ent1->d_name, ".." ) == 0 )
- {
-@@ -202,7 +202,7 @@
- {
- if ( * ( Statebag->CurrentDirectory ) )
- {
-- char* slash=strrchr ( * ( Statebag->CurrentDirectory ), '/' );
-+ char* slash=strrchr ( (char *)* ( Statebag->CurrentDirectory ), '/' );
-
- if ( slash )
- {
-diff -uNr filebrowser-0.2.0-orig/menu-filebrowser.h filebrowser-0.2.0/menu-filebrowser.h
---- filebrowser-0.2.0-orig/menu-filebrowser.h 2009-05-27 19:26:47.000000000 +0200
-+++ filebrowser-0.2.0/menu-filebrowser.h 2009-05-27 19:34:26.000000000 +0200
-@@ -72,7 +72,7 @@
-
- eMenuFilebrowserTask Task;
-
-- static int DirectorySort(const void* File1, const void* File2);
-+ static int DirectorySort(const dirent64** File1, const dirent64** File2);
- /*
- * This filters entries shown in Filebrowser
- * The function uses Statebag->ShowHiddenFiles and Statebag->Filter
-diff -uNr filebrowser-0.2.0-orig/commands.c filebrowser-0.2.0/commands.c
---- filebrowser-0.2.0-orig/commands.c 2009-05-27 19:37:46.000000000 +0200
-+++ filebrowser-0.2.0/commands.c 2009-05-27 19:38:00.000000000 +0200
-@@ -97,7 +97,7 @@
- if(Pattern[0]!='/')
- {
- char* filename_tmp=NULL;
-- Filename=(Filename && (filename_tmp=strrchr(Filename, '/'))) ? filename_tmp + 1 : NULL;
-+ Filename=(Filename && (filename_tmp=strrchr((char *)Filename, '/'))) ? filename_tmp + 1 : NULL;
- }
- if(Filename==NULL)
- {
-@@ -173,9 +173,9 @@
- D(fprintf(stderr, "\"%s\" ", Command->Command));
- break;
- case 3: //Flags for this command
-- Command->Synchronous=strchr(Text, 's');
-- Command->Menu=!strchr(Text, 'b');
-- Command->RemoveFinished=strchr(Text, 'r');
-+ Command->Synchronous=strchr((char *)Text, 's');
-+ Command->Menu=!strchr((char *)Text, 'b');
-+ Command->RemoveFinished=strchr((char *)Text, 'r');
- D(fprintf(stderr, " Sync:%d Menu:%d Remove:%d ", Command->Synchronous, Command->Menu, Command->RemoveFinished));
- break;
- case 4: //An access code
-diff -uNr filebrowser-0.2.0-orig/tools.c filebrowser-0.2.0/tools.c
---- filebrowser-0.2.0-orig/tools.c 2009-05-27 19:37:46.000000000 +0200
-+++ filebrowser-0.2.0/tools.c 2009-05-27 19:38:00.000000000 +0200
-@@ -89,7 +89,7 @@
- {
- if (string)
- {
-- char *commentPosition = strchr(string, '#');
-+ char *commentPosition = strchr((char *)string, '#');
- if (commentPosition)
- {
- *commentPosition = 0;
Added: trunk/archvdr/vdr-plugin-filebrowser/glibc_fixes.patch
===================================================================
--- trunk/archvdr/vdr-plugin-filebrowser/glibc_fixes.patch (rev 0)
+++ trunk/archvdr/vdr-plugin-filebrowser/glibc_fixes.patch 2009-05-28 15:07:53 UTC (rev 220)
@@ -0,0 +1,71 @@
+diff -uNr filebrowser-0.2.0-orig/developers/filebrowserdemo/filebrowserlib/menu-filebrowser.c filebrowser-0.2.0/developers/filebrowserdemo/filebrowserlib/menu-filebrowser.c
+--- filebrowser-0.2.0-orig/developers/filebrowserdemo/filebrowserlib/menu-filebrowser.c 2009-05-27 19:26:47.000000000 +0200
++++ filebrowser-0.2.0/developers/filebrowserdemo/filebrowserlib/menu-filebrowser.c 2009-05-27 19:35:59.000000000 +0200
+@@ -141,12 +141,12 @@
+ if ( BaseDirectory ) delete BaseDirectory;
+ }
+
+-int cOsdMenuFilebrowser::DirectorySort ( const void* File1, const void* File2 )
++int cOsdMenuFilebrowser::DirectorySort ( const dirent64** File1, const dirent64** File2 )
+ {
+
+- struct dirent64* ent1=* ( struct dirent64** ) File1;
++ const struct dirent64* ent1=*File1;
+
+- struct dirent64* ent2=* ( struct dirent64** ) File2;
++ const struct dirent64* ent2=*File2;
+
+ if ( strcmp ( ent1->d_name, ".." ) == 0 )
+ {
+@@ -202,7 +202,7 @@
+ {
+ if ( * ( Statebag->CurrentDirectory ) )
+ {
+- char* slash=strrchr ( * ( Statebag->CurrentDirectory ), '/' );
++ char* slash=strrchr ( (char *)* ( Statebag->CurrentDirectory ), '/' );
+
+ if ( slash )
+ {
+diff -uNr filebrowser-0.2.0-orig/developers/filebrowserdemo/filebrowserlib/menu-filebrowser.h filebrowser-0.2.0/developers/filebrowserdemo/filebrowserlib/menu-filebrowser.h
+--- filebrowser-0.2.0-orig/developers/filebrowserdemo/filebrowserlib/menu-filebrowser.h 2009-05-27 19:26:47.000000000 +0200
++++ filebrowser-0.2.0/developers/filebrowserdemo/filebrowserlib/menu-filebrowser.h 2009-05-27 19:34:26.000000000 +0200
+@@ -72,7 +72,7 @@
+
+ eMenuFilebrowserTask Task;
+
+- static int DirectorySort(const void* File1, const void* File2);
++ static int DirectorySort(const dirent64** File1, const dirent64** File2);
+ /*
+ * This filters entries shown in Filebrowser
+ * The function uses Statebag->ShowHiddenFiles and Statebag->Filter
+diff -uNr filebrowser-0.2.0-orig/menu-filebrowser.c filebrowser-0.2.0/menu-filebrowser.c
+--- filebrowser-0.2.0-orig/menu-filebrowser.c 2009-05-27 19:26:47.000000000 +0200
++++ filebrowser-0.2.0/menu-filebrowser.c 2009-05-27 19:35:59.000000000 +0200
+@@ -141,12 +141,12 @@
+ if ( BaseDirectory ) delete BaseDirectory;
+ }
+
+-int cOsdMenuFilebrowser::DirectorySort ( const void* File1, const void* File2 )
++int cOsdMenuFilebrowser::DirectorySort ( const dirent64** File1, const dirent64** File2 )
+ {
+
+- struct dirent64* ent1=* ( struct dirent64** ) File1;
++ const struct dirent64* ent1=*File1;
+
+- struct dirent64* ent2=* ( struct dirent64** ) File2;
++ const struct dirent64* ent2=*File2;
+
+ if ( strcmp ( ent1->d_name, ".." ) == 0 )
+ {
+diff -uNr filebrowser-0.2.0-orig/menu-filebrowser.h filebrowser-0.2.0/menu-filebrowser.h
+--- filebrowser-0.2.0-orig/menu-filebrowser.h 2009-05-27 19:26:47.000000000 +0200
++++ filebrowser-0.2.0/menu-filebrowser.h 2009-05-27 19:34:26.000000000 +0200
+@@ -72,7 +72,7 @@
+
+ eMenuFilebrowserTask Task;
+
+- static int DirectorySort(const void* File1, const void* File2);
++ static int DirectorySort(const dirent64** File1, const dirent64** File2);
+ /*
+ * This filters entries shown in Filebrowser
+ * The function uses Statebag->ShowHiddenFiles and Statebag->Filter
Modified: trunk/archvdr/vdr-plugin-infosatepg/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-infosatepg/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-infosatepg/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -25,10 +25,9 @@
mkdir -p $pkgdir/usr/lib/vdr/plugins/ || return 1
- make VDRDIR=/usr/include/vdr \
+ make VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
- LOCALEDIR="$startdir/pkg/usr/share/locale/" \
- DVBDIR=/usr/src/s2-headers/linux all || return 1
+ LOCALEDIR="$startdir/pkg/usr/share/locale/" all || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
install -m 755 libvdr-*.so.* $pkgdir/usr/lib/vdr/plugins/ || return 1
Modified: trunk/archvdr/vdr-plugin-live/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-live/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-live/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -15,7 +15,7 @@
arch=('i686' 'x86_64')
url="http://live.vdr-developer.org"
license=('GPL2')
-depends=('gcc>=4.1' 'vdr>=1.4.0' 'tntnet>=1.6.0.6' 'cxxtools>=1.4.3' 'vdr-plugin-epgsearch>=0.9.22' 'vdr-plugin-streamdev-server>=0.3.3')
+depends=('gcc43' 'vdr>=1.4.0' 'tntnet>=1.6.0.6' 'cxxtools>=1.4.3' 'vdr-plugin-epgsearch>=0.9.22' 'vdr-plugin-streamdev-server>=0.3.3')
backup=('etc/vdr/plugins/plugin.live.conf')
source=(http://live.vdr-developer.org/downloads/vdr-$_pluginname-$pkgver.tar.gz
plugin.live.conf)
@@ -26,7 +26,7 @@
build() {
cd "$srcdir/${_pluginname}-$pkgver" || return 1
- make VDRDIR="/usr/include/vdr" LIBDIR="." \
+ make VDRDIR="/usr/include/vdr" LIBDIR="." CXX=g++-4.3 \
LOCALEDIR="$pkgdir/usr/share/locale" all || return 1
mkdir -p $pkgdir/etc/vdr/plugins || return 1
Modified: trunk/archvdr/vdr-plugin-live-git/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-live-git/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-live-git/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -9,7 +9,7 @@
arch=('i686' 'x86_64')
url="http://live.vdr-developer.org"
license=('GPL2')
-depends=('gcc>=4.1' 'vdr>=1.4.0' 'tntnet>=1.6.0.6' 'cxxtools>=1.4.3' 'vdr-plugin-epgsearch>=0.9.22' 'vdr-plugin-streamdev-server>=0.3.3' 'git')
+depends=('gcc43' 'vdr>=1.4.0' 'tntnet>=1.6.0.6' 'cxxtools>=1.4.3' 'vdr-plugin-epgsearch>=0.9.22' 'vdr-plugin-streamdev-server>=0.3.3' 'git')
backup=('etc/vdr/plugins/plugin.live.conf')
source=(plugin.live.conf)
install=vdr-plugin-$_pluginname-git.install
@@ -28,7 +28,7 @@
cd $srcdir/vdr-plugin-$_pluginname
git checkout $gitid
- make VDRDIR="/usr/include/vdr" LIBDIR="." \
+ make VDRDIR="/usr/include/vdr" LIBDIR="." CXX=g++-4.3 \
LOCALEDIR="$pkgdir/usr/share/locale" all || return 1
mkdir -p $pkgdir/etc/vdr/plugins || return 1
Modified: trunk/archvdr/vdr-plugin-mailbox/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-mailbox/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-mailbox/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -21,10 +21,9 @@
cd ${srcdir}/$_pkgname-${pkgver}
- make VDRDIR=/usr/include/vdr \
+ make VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
- LOCALEDIR="$startdir/pkg/usr/share/locale/" \
- DVBDIR=/usr/src/s2-headers/linux all || return 1
+ LOCALEDIR="$startdir/pkg/usr/share/locale/" all || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
install -m 755 libvdr-*.so.* $pkgdir/usr/lib/vdr/plugins/ || return 1
Modified: trunk/archvdr/vdr-plugin-menuorg/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-menuorg/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-menuorg/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -30,8 +30,7 @@
make VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
- LOCALEDIR="$startdir/pkg/usr/share/locale/" \
- DVBDIR=/usr/src/s2-headers/linux all || return 1
+ LOCALEDIR="$startdir/pkg/usr/share/locale/" all || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
install -m 755 libvdr-*.so.* $pkgdir/usr/lib/vdr/plugins/ || return 1
Modified: trunk/archvdr/vdr-plugin-mlist/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-mlist/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-mlist/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -24,11 +24,10 @@
sed -e 's/include\/vdr\///g' -i Makefile
- make VDRDIR=/usr/include/vdr \
+ make VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
INCLUDES="-I/usr/src/s2-headers/linux/include -I/usr/include/vdr" \
LOCALEDIR="$startdir/pkg/usr/share/locale/" \
- DVBDIR=/usr/src/s2-headers/linux
HASLOCALE="1" || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
Modified: trunk/archvdr/vdr-plugin-osdteletext/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-osdteletext/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-osdteletext/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -25,10 +25,9 @@
mkdir -p $pkgdir/usr/lib/vdr/plugins/ || return 1
- make VDRDIR=/usr/include/vdr \
+ make VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
- LOCALEDIR="$startdir/pkg/usr/share/locale/" \
- DVBDIR=/usr/src/s2-headers/linux all || return 1
+ LOCALEDIR="$startdir/pkg/usr/share/locale/" all || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
install -m 755 libvdr-*.so.* $pkgdir/usr/lib/vdr/plugins/ || return 1
Modified: trunk/archvdr/vdr-plugin-premiereepg/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-premiereepg/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-premiereepg/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -24,11 +24,10 @@
sed -e 's/include\/vdr\///g' -i Makefile
- make VDRDIR=/usr/include/vdr \
+ make VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
INCLUDES="-I/usr/src/s2-headers/linux/include -I/usr/include/vdr" \
LOCALEDIR="$startdir/pkg/usr/share/locale/" \
- DVBDIR=/usr/src/s2-headers/linux
HASLOCALE="1" || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
Modified: trunk/archvdr/vdr-plugin-radiolist/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-radiolist/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-radiolist/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -22,7 +22,7 @@
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
mkdir -p $pkgdir/usr/share/locale || return 1
- make VDRDIR=/usr/include/vdr LIBDIR=. \
+ make VDRDIR=/usr/include/vdr LIBDIR=. CXX=g++-4.3 \
LOCALEDIR=$pkgdir/usr/share/locale all || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
Modified: trunk/archvdr/vdr-plugin-reelchannelscan/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-reelchannelscan/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-reelchannelscan/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -2,7 +2,7 @@
pkgname=vdr-plugin-reelchannelscan
revision=10454
-pkgver=0.6.1~$_revision
+pkgver=0.6.1
pkgrel=1
pkgdesc="VDR-Plugin to use scan channels."
url="svn://reelbox.org/testing/src/vdr-plugins/src"
@@ -38,10 +38,10 @@
patch -p1 -i ${startdir}/patches/makefile.patch || return 1
patch -p1 -i ${startdir}/patches/64bit.patch || return 1
- make all VDRDIR=/usr/include/vdr \
+ make all VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
LOCALEDIR="$startdir/pkg/usr/share/locale/" \
- DVBDIR=/usr/src/s2-headers/linux || return 1
+ DVBDIR=/usr/include || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins/ || return 1
cp libvdr-*.so.* $pkgdir/usr/lib/vdr/plugins/ || return 1
Modified: trunk/archvdr/vdr-plugin-remote/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-remote/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-remote/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -28,10 +28,9 @@
mkdir -p $pkgdir/usr/lib/vdr/plugins/ || return 1
- make VDRDIR=/usr/include/vdr \
+ make VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
- LOCALEDIR="$startdir/pkg/usr/share/locale/" \
- DVBDIR=/usr/src/s2-headers/linux all || return 1
+ LOCALEDIR="$startdir/pkg/usr/share/locale/" all || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
install -m 755 libvdr-*.so.* $pkgdir/usr/lib/vdr/plugins/ || return 1
Modified: trunk/archvdr/vdr-plugin-rockantenne/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-rockantenne/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-rockantenne/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -26,10 +26,9 @@
mkdir -p $pkgdir/usr/lib/vdr/plugins/ || return 1
- make VDRDIR=/usr/include/vdr \
+ make VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
- LOCALEDIR="$startdir/pkg/usr/share/locale/" \
- DVBDIR=/usr/src/s2-headers/linux all || return 1
+ LOCALEDIR="$startdir/pkg/usr/share/locale/" all || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
install -m 755 libvdr-*.so.* $pkgdir/usr/lib/vdr/plugins/ || return 1
Modified: trunk/archvdr/vdr-plugin-rssreader/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-rssreader/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-rssreader/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -24,10 +24,9 @@
mkdir -p $pkgdir/usr/lib/vdr/plugins/ || return 1
- make VDRDIR=/usr/include/vdr \
+ make VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
- LOCALEDIR="$startdir/pkg/usr/share/locale/" \
- DVBDIR=/usr/src/s2-headers/linux all || return 1
+ LOCALEDIR="$startdir/pkg/usr/share/locale/" all || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
install -m 755 libvdr-*.so.* $pkgdir/usr/lib/vdr/plugins/ || return 1
Modified: trunk/archvdr/vdr-plugin-skinenigmang/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-skinenigmang/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-skinenigmang/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -23,7 +23,7 @@
cd $startdir/src/skinenigmang-$pkgver
- make VDRDIR=/usr/include/vdr \
+ make VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
LOCALEDIR="$startdir/pkg/usr/share/locale/" \
HAVE_IMAGEMAGICK=1 \
Modified: trunk/archvdr/vdr-plugin-skinsoppalusikka/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-skinsoppalusikka/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-skinsoppalusikka/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -24,10 +24,9 @@
mkdir -p $pkgdir/usr/lib/vdr/plugins/ || return 1
- make VDRDIR=/usr/include/vdr \
+ make VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
- LOCALEDIR="$startdir/pkg/usr/share/locale/" \
- DVBDIR=/usr/src/s2-headers/linux all || return 1
+ LOCALEDIR="$startdir/pkg/usr/share/locale/" all || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
install -m 755 libvdr-*.so.* $pkgdir/usr/lib/vdr/plugins/ || return 1
Modified: trunk/archvdr/vdr-plugin-streamdev-server/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-streamdev-server/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-streamdev-server/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -46,7 +46,7 @@
patch -Np0 -i ../sibuffer-0.4.diff || return 1
#patch -Np1 -i ../safety_mutex.patch || return 1
- make VDRDIR="/usr/include/vdr" LIBDIR="." \
+ make VDRDIR="/usr/include/vdr" LIBDIR="." CXX=g++-4.3 \
LOCALEDIR="$pkgdir/usr/share/locale" all || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
Modified: trunk/archvdr/vdr-plugin-systeminfo/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-systeminfo/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-systeminfo/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -27,7 +27,7 @@
build() {
cd "$srcdir/${_pluginname}-$pkgver"
- make VDRDIR="/usr/include/vdr" INCLUDES="-I/usr/include/vdr" LIBDIR="." \
+ make VDRDIR="/usr/include/vdr" INCLUDES="-I/usr/include/vdr" LIBDIR="." CXX=g++-4.3 \
LOCALEDIR="$pkgdir/usr/share/locale" all || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
Modified: trunk/archvdr/vdr-plugin-timeline/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-timeline/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-timeline/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -22,10 +22,9 @@
mkdir -p $pkgdir/usr/lib/vdr/plugins/ || return 1
- make VDRDIR=/usr/include/vdr \
+ make VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
- LOCALEDIR="$startdir/pkg/usr/share/locale/" \
- DVBDIR=/usr/src/s2-headers/linux all || return 1
+ LOCALEDIR="$startdir/pkg/usr/share/locale/" all || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
install -m 755 libvdr-*.so.* $pkgdir/usr/lib/vdr/plugins/ || return 1
Modified: trunk/archvdr/vdr-plugin-trayopen/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-trayopen/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-trayopen/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -30,10 +30,9 @@
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
- make VDRDIR=/usr/include/vdr \
+ make VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
- LOCALEDIR="$startdir/pkg/usr/share/locale/" \
- DVBDIR=/usr/src/s2-headers/linux all || return 1
+ LOCALEDIR="$startdir/pkg/usr/share/locale/" all || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
install -m 755 libvdr-*.so.* $pkgdir/usr/lib/vdr/plugins/ || return 1
Modified: trunk/archvdr/vdr-plugin-undelete/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-undelete/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-undelete/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -26,10 +26,9 @@
sh debian/patches/90_APIVERSION.dpatch -patch || return 1
patch -p1 -i ../i18n.patch || return 1
- make VDRDIR=/usr/include/vdr \
+ make VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
- LOCALEDIR="$startdir/pkg/usr/share/locale/" \
- DVBDIR=/usr/src/s2-headers/linux all || return 1
+ LOCALEDIR="$startdir/pkg/usr/share/locale/" all || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
install -m 755 libvdr-*.so.* $pkgdir/usr/lib/vdr/plugins/ || return 1
Modified: trunk/archvdr/vdr-plugin-upnp/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-upnp/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+++ trunk/archvdr/vdr-plugin-upnp/PKGBUILD 2009-05-28 15:07:53 UTC (rev 220)
@@ -25,12 +25,11 @@
mv upnp.cpp upnp.c
mv vdrmediaserver.cpp vdrmediaserver.c
- make VDRDIR=/usr/include/vdr \
+ make VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
CXXFLAGS+="-L/usr/lib -ljamm -lplatinum-upnp" \
OBJS+="upnp.o vdrmediaserver.o" \
- LOCALEDIR="$startdir/pkg/usr/share/locale/" \
- DVBDIR=/usr/src/s2-headers/linux || return 1
+ LOCALEDIR="$startdir/pkg/usr/share/locale/" all || return 1
mkdir -p $pkgdir/usr/lib/vdr/plugins || return 1
install -m 755 libvdr-*.so.* $pkgdir/usr/lib/vdr/plugins/ || return 1
Modified: trunk/archvdr/vdr-plugin-wirbelscan/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-wirbelscan/PKGBUILD 2009-05-27 21:03:44 UTC (rev 219)
+...
[truncated message content] |
