From 21064fe93897fa3d353888c4f9d4009cdb6cfda4 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 29 Dec 2011 19:02:11 +0100
Subject: [PATCH] vdr-sc: fix build

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/3rdparty/multimedia/vdr-sc/build       |  6 +++++-
 .../patches/vdr-sc-603-crosscompiling.patch     | 17 +++--------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/packages/3rdparty/multimedia/vdr-sc/build b/packages/3rdparty/multimedia/vdr-sc/build
index 59346e9ab1..9b07f2380d 100755
--- a/packages/3rdparty/multimedia/vdr-sc/build
+++ b/packages/3rdparty/multimedia/vdr-sc/build
@@ -24,6 +24,10 @@
 
 VDR_DIR=`basename $BUILD/vdr-[0-9]*`
 
+CFLAGS="$CFLAGS -fPIC"
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
 # dont build parallel
   MAKEFLAGS=-j1
 
@@ -31,5 +35,5 @@ cd $PKG_BUILD
   make VDRDIR="../$VDR_DIR" \
        LIBDIR="." \
        LOCALEDIR="./locale" \
-       FLAGS="$CFLAGS -Wall -fPIC -fomit-frame-pointer -fexpensive-optimizations -funroll-loops"
+       CSAFLAGS="$CFLAGS -Wall -fomit-frame-pointer -fexpensive-optimizations -funroll-loops"
 
diff --git a/packages/3rdparty/multimedia/vdr-sc/patches/vdr-sc-603-crosscompiling.patch b/packages/3rdparty/multimedia/vdr-sc/patches/vdr-sc-603-crosscompiling.patch
index 9a77353ae1..cba6f3ebb2 100644
--- a/packages/3rdparty/multimedia/vdr-sc/patches/vdr-sc-603-crosscompiling.patch
+++ b/packages/3rdparty/multimedia/vdr-sc/patches/vdr-sc-603-crosscompiling.patch
@@ -1,23 +1,12 @@
 diff -Naur vdr-sc-603/Makefile vdr-sc-603.patch/Makefile
 --- vdr-sc-603/Makefile	2011-12-24 04:02:53.000000000 +0100
-+++ vdr-sc-603.patch/Makefile	2011-12-29 17:17:55.580630199 +0100
-@@ -140,9 +140,8 @@
- endif
- 
- # FFdeCSA
--CPUOPT     ?= pentium
- PARALLEL   ?= PARALLEL_32_INT
--CSAFLAGS   ?= -Wall -fPIC -g -O3 -mmmx -fomit-frame-pointer -fexpensive-optimizations -funroll-loops
-+CFLAGS   ?= -Wall -fPIC -g -O3 -mmmx -fomit-frame-pointer -fexpensive-optimizations -funroll-loops
- FFDECSADIR  = FFdecsa
- FFDECSA     = $(FFDECSADIR)/FFdecsa.o
- FFDECSATEST = $(FFDECSADIR)/FFdecsa_test.done
-@@ -213,7 +212,7 @@
++++ vdr-sc-603.patch/Makefile	2011-12-29 18:57:21.660586103 +0100
+@@ -213,7 +213,7 @@
  	@cp -p $< $@
  
  $(FFDECSA) $(FFDECSATEST): $(FFDECSADIR)/*.c $(FFDECSADIR)/*.h
 -	@$(MAKE) COMPILER="$(CXX)" FLAGS="$(CSAFLAGS) -march=$(CPUOPT)" PARALLEL_MODE=$(PARALLEL) -C $(FFDECSADIR) all
-+	@$(MAKE) COMPILER="$(CXX)" FLAGS="$(CFLAGS)" PARALLEL_MODE=$(PARALLEL) -C $(FFDECSADIR) FFdecsa.o
++	@$(MAKE) COMPILER="$(CXX)" FLAGS="$(CSAFLAGS)" PARALLEL_MODE=$(PARALLEL) -C $(FFDECSADIR) FFdecsa.o
  
  $(I18Npot): $(shell grep -rl '\(tr\|trNOOP\)(\".*\")' *.c $(SYSDIR))
  	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<noone@nowhere.org>' -o $@ `ls $^`