diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta index 06be1b532c..663200826c 100644 --- a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta +++ b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="vdr-plugin-dvbapi" -PKG_VERSION="e87e15f" +PKG_VERSION="cd93752" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-cd93752-crosscompiling.patch b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-cd93752-crosscompiling.patch new file mode 100644 index 0000000000..a249ffc18f --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-cd93752-crosscompiling.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index d18b016..278af2b 100644 +--- a/Makefile ++++ b/Makefile +@@ -156,7 +156,7 @@ libdvbapi-dvbufs9xx.so: device-ufs9xx.o + + ifndef LIBDVBCSA + $(FFDECSA): $(FFDECSADIR)/*.c $(FFDECSADIR)/*.h +- @$(MAKE) COMPILER="$(CXX)" FLAGS="$(CXXFLAGS) $(LDFLAGS) $(CSAFLAGS)" PARALLEL_MODE=$(PARALLEL) -C $(FFDECSADIR) all ++ @$(MAKE) COMPILER="$(CXX)" FLAGS="$(CXXFLAGS) $(LDFLAGS) $(CSAFLAGS)" PARALLEL_MODE=$(PARALLEL) -C $(FFDECSADIR) FFdecsa.o + endif + + install-lib: $(SOFILE) diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-cd93752-ffdecsa.patch b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-cd93752-ffdecsa.patch new file mode 100644 index 0000000000..22f0684687 --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-cd93752-ffdecsa.patch @@ -0,0 +1,16 @@ +diff --git a/Makefile b/Makefile +index 278af2b..996dc77 100644 +--- a/Makefile ++++ b/Makefile +@@ -85,8 +85,9 @@ OBJS = CAPMT.o DeCSA.o DeCsaTSBuffer.o dll.o DVBAPI.o DVBAPISetup.o SCDeviceProb + + ifndef LIBDVBCSA + # FFdeCSA +-PARALLEL ?= PARALLEL_128_SSE2 +-CSAFLAGS ?= -fexpensive-optimizations -funroll-loops -mmmx -msse -msse2 -msse3 ++CPUOPT ?= pentium ++PARALLEL ?= PARALLEL_32_INT ++CSAFLAGS ?= -Wall -fPIC -g -O3 -mmmx -fomit-frame-pointer -fexpensive-optimizations -funroll-loops + FFDECSADIR = FFdecsa + FFDECSA = $(FFDECSADIR)/FFdecsa.o + DECSALIB = $(FFDECSA) diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-e87e15f-crosscompiling.patch b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-e87e15f-crosscompiling.patch deleted file mode 100644 index 7c9faef64e..0000000000 --- a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-e87e15f-crosscompiling.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur vdr-dvbapi-plugin-6e8cad7/Makefile vdr-dvbapi-plugin-6e8cad7.patch/Makefile ---- vdr-dvbapi-plugin-6e8cad7/Makefile 2011-12-25 14:24:33.000000000 +0100 -+++ vdr-dvbapi-plugin-6e8cad7.patch/Makefile 2011-12-29 18:59:21.847652339 +0100 -@@ -80,7 +80,7 @@ - gcc -O -fbuiltin -fomit-frame-pointer -fPIC -shared -o $@ $< -ldl - - $(FFDECSA): $(FFDECSADIR)/*.c $(FFDECSADIR)/*.h -- @$(MAKE) COMPILER="$(CXX)" FLAGS="$(CSAFLAGS) -march=$(CPUOPT)" PARALLEL_MODE=$(PARALLEL) -C $(FFDECSADIR) all -+ @$(MAKE) COMPILER="$(CXX)" FLAGS="$(CSAFLAGS)" PARALLEL_MODE=$(PARALLEL) -C $(FFDECSADIR) FFdecsa.o - - dist: clean - @-rm -rf $(TMPDIR)/$(ARCHIVE) diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-e87e15f-ffdecsa.patch b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-e87e15f-ffdecsa.patch deleted file mode 100644 index ed4e806134..0000000000 --- a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-e87e15f-ffdecsa.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/Makefile b/Makefile -index a8c7d97..6084cec 100644 ---- a/Makefile -+++ b/Makefile -@@ -54,9 +54,9 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' - OBJS = CAPMT.o DeCSA.o DeCsaTSBuffer.o DVBAPI.o DVBAPISetup.o SCDeviceProbe.o SCDVBDevice.o UDPSocket.o SCCIAdapter.o Frame.o SCCAMSlot.o - - # FFdeCSA --CPUOPT ?= athlon64 --PARALLEL ?= PARALLEL_128_SSE --CSAFLAGS ?= -fPIC -O3 -fexpensive-optimizations -funroll-loops -mmmx -msse -msse2 -msse3 -+CPUOPT ?= pentium -+PARALLEL ?= PARALLEL_32_INT -+CSAFLAGS ?= -Wall -fPIC -g -O3 -mmmx -fomit-frame-pointer -fexpensive-optimizations -funroll-loops - FFDECSADIR = FFdecsa - FFDECSA = $(FFDECSADIR)/FFdecsa.o - FFDECSATEST = $(FFDECSADIR)/FFdecsa_test.done