[Archvdr-devel] SF.net SVN: archvdr:[215] trunk/archvdr
Brought to you by:
huceke
Menu
▾
▴
[Archvdr-devel] SF.net SVN: archvdr:[215] trunk/archvdr
|
From: <hu...@us...> - 2009-05-27 20:50:47
|
Revision: 215
http://archvdr.svn.sourceforge.net/archvdr/?rev=215&view=rev
Author: huceke
Date: 2009-05-27 20:50:44 +0000 (Wed, 27 May 2009)
Log Message:
-----------
Use gcc 4.3.3 instead of that bullshit gcc 4.4 in the arch repos.
Modified Paths:
--------------
trunk/archvdr/vdr-1.7.0/PKGBUILD
trunk/archvdr/vdr-1.7.0/files/Make.config
trunk/archvdr/vdr-1.7.0/patches/00list
trunk/archvdr/vdr-plugin-menuorg/PKGBUILD
trunk/archvdr/vdr-plugin-xine/PKGBUILD
Removed Paths:
-------------
trunk/archvdr/vdr-plugin-xine/disable_xineplayer_gcc_4.4_hack.patch
Modified: trunk/archvdr/vdr-1.7.0/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-1.7.0/PKGBUILD 2009-05-27 20:49:48 UTC (rev 214)
+++ trunk/archvdr/vdr-1.7.0/PKGBUILD 2009-05-27 20:50:44 UTC (rev 215)
@@ -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' 's2-liplianin-hg' 'start-stop-daemon' 'gcc43')
+makedepends=('fakeroot' 'gcc' 'gcc43')
optdepends=('vdr-addon-acpiwakeup')
install=$pkgname.install
source=(ftp://ftp.cadsoft.de/vdr/Developer/vdr-${pkgver}.tar.bz2)
Modified: trunk/archvdr/vdr-1.7.0/files/Make.config
===================================================================
--- trunk/archvdr/vdr-1.7.0/files/Make.config 2009-05-27 20:49:48 UTC (rev 214)
+++ trunk/archvdr/vdr-1.7.0/files/Make.config 2009-05-27 20:50:44 UTC (rev 215)
@@ -10,10 +10,10 @@
### The C compiler and options:
-CC = gcc
-CFLAGS += -O2 -Wall
+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.0/patches/00list
===================================================================
--- trunk/archvdr/vdr-1.7.0/patches/00list 2009-05-27 20:49:48 UTC (rev 214)
+++ trunk/archvdr/vdr-1.7.0/patches/00list 2009-05-27 20:50:44 UTC (rev 215)
@@ -97,4 +97,4 @@
vdr-1.7.0-ext68-streamdev
vdr-1.6.0-parentalrating-content
-gcc_4.4
+#gcc_4.4
Modified: trunk/archvdr/vdr-plugin-menuorg/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-menuorg/PKGBUILD 2009-05-27 20:49:48 UTC (rev 214)
+++ trunk/archvdr/vdr-plugin-menuorg/PKGBUILD 2009-05-27 20:50:44 UTC (rev 215)
@@ -28,7 +28,7 @@
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
Modified: trunk/archvdr/vdr-plugin-xine/PKGBUILD
===================================================================
--- trunk/archvdr/vdr-plugin-xine/PKGBUILD 2009-05-27 20:49:48 UTC (rev 214)
+++ trunk/archvdr/vdr-plugin-xine/PKGBUILD 2009-05-27 20:50:44 UTC (rev 215)
@@ -8,7 +8,7 @@
arch=('i686' 'x86_64')
url="http://home.vrweb.de/~rnissl/"
license=('GPL2')
-depends=('gcc' 'vdr' 'xine-lib')
+depends=('gcc43' 'vdr' 'xine-lib')
optdepends=('oxine-vdr' 'xine-ui-vdr')
source=(http://home.vrweb.de/~rnissl/vdr-$_packagename-$pkgver.tgz
plugin.xine.conf
@@ -24,15 +24,15 @@
build() {
cd "$srcdir/${_packagename}-$pkgver" || return 1
-
+
unset CXXFLAGS
patch -p1 -i ../01_debian.dpatch || return 1
# Temporary hack until arch gcc 4.4 is fixed
- patch -p1 -i ../disable_xineplayer_gcc_4.4_hack.patch || return 1
+ # patch -p1 -i ../disable_xineplayer_gcc_4.4_hack.patch || return 1
- make VDRDIR=/usr/include/vdr \
+ make VDRDIR=/usr/include/vdr CXX=g++-4.3 \
LIBDIR=. \
LOCALEDIR="$startdir/pkg/usr/share/locale/"|| return 1
@@ -43,7 +43,7 @@
install -m 644 ../plugin.xine.conf $pkgdir/etc/vdr/plugins/ || return 1
mkdir -p $pkgdir/usr/bin || return 1
- #install -m 755 xineplayer $pkgdir/usr/bin/ || return 1
+ install -m 755 xineplayer $pkgdir/usr/bin/ || return 1
mkdir -p $pkgdir/usr/share/vdr-plugin-xine/ || return 1
install -m 644 data/*.mpg $pkgdir/usr/share/vdr-plugin-xine/ || return 1
Deleted: trunk/archvdr/vdr-plugin-xine/disable_xineplayer_gcc_4.4_hack.patch
===================================================================
--- trunk/archvdr/vdr-plugin-xine/disable_xineplayer_gcc_4.4_hack.patch 2009-05-27 20:49:48 UTC (rev 214)
+++ trunk/archvdr/vdr-plugin-xine/disable_xineplayer_gcc_4.4_hack.patch 2009-05-27 20:50:44 UTC (rev 215)
@@ -1,21 +0,0 @@
---- xine-0.9.2-orig/Makefile 2009-05-27 20:11:17.000000000 +0200
-+++ xine-0.9.2/Makefile 2009-05-27 20:11:26.000000000 +0200
-@@ -98,7 +98,7 @@
-
- ### The main target:
-
--all: libvdr-$(PLUGIN).so i18n xineplayer
-+all: libvdr-$(PLUGIN).so i18n
-
- ### Implicit rules:
-
-@@ -155,9 +155,6 @@
- @rm $(addprefix "$(DATA_DIR)/", $(patsubst data/%,%,$(wildcard data/*)))
- @rmdir --ignore-fail-on-non-empty "$(DATA_DIR)"
-
--xineplayer: xineplayer.o Makefile
-- $(CXX) $(CXXFLAGS) xineplayer.o -o $@
--
- dist: clean
- @-rm -rf $(TMPDIR)/$(ARCHIVE)
- @mkdir $(TMPDIR)/$(ARCHIVE)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|