jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

vdr-plugin-dvbapi: update to vdr-plugin-dvbapi-400879b

Browse Source
This commit is contained in:
Stefan Saraev 2014-02-21 21:51:09 +02:00
parent 2409be5782
commit 8534bcf0a4
3 changed files with 11 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/3rdparty/multimedia/vdr-plugin-dvbapi/package.mk vendored
View File

@ -17,7 +17,7 @@
################################################################################ ################################################################################
PKG_NAME="vdr-plugin-dvbapi" PKG_NAME="vdr-plugin-dvbapi"
PKG_VERSION="4d9de95" PKG_VERSION="400879b"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

47
packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-02_makefile.patch vendored
View File

@ -1,13 +1,13 @@
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index ebe9d76..ef2d2e5 100644 index a49dda6..873e73d 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -15,18 +15,11 @@ VERSION = $(shell grep 'static const char \*VERSION *=' DVBAPI.h | awk '{ print @@ -16,18 +16,11 @@ GITTAG = $(shell git describe --always 2>/dev/null)
### The directory environment: ### The directory environment:
-# Use package data if installed...otherwise assume we're under the VDR source directory: -# Use package data if installed...otherwise assume we're under the VDR source directory:
-PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) -PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr))
-LIBDIR = $(call PKGCFG,libdir) -LIBDIR = $(call PKGCFG,libdir)
-LOCDIR = $(call PKGCFG,locdir) -LOCDIR = $(call PKGCFG,locdir)
-PLGCFG = $(call PKGCFG,plgcfg) -PLGCFG = $(call PKGCFG,plgcfg)
@ -22,56 +22,29 @@ index ebe9d76..ef2d2e5 100644
### Allow user defined options to overwrite defaults: ### Allow user defined options to overwrite defaults:
@@ -34,33 +27,7 @@ export CXXFLAGS = $(call PKGCFG,cxxflags) @@ -35,7 +28,7 @@ export CXXFLAGS = $(call PKGCFG,cxxflags)
### The version number of VDR's plugin API: ### The version number of VDR's plugin API:
-APIVERSION = $(call PKGCFG,apiversion) -APIVERSION = $(call PKGCFG,apiversion)
-ifeq ($(strip $(APIVERSION)),)
-APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
-NOCONFIG := 1
-endif
-
-# backward compatibility with VDR version < 1.7.34
-API1733 := $(shell if [ "$(APIVERSION)" \< "1.7.34" ]; then echo true; fi; )
-
-ifdef API1733
-
-VDRSRC = $(VDRDIR)
-ifeq ($(strip $(VDRSRC)),)
-VDRSRC := ../../..
-endif
-LIBDIR = $(VDRSRC)/PLUGINS/lib
-
-ifndef NOCONFIG
-CXXFLAGS = $(call PKGCFG,cflags)
-CXXFLAGS += -fPIC
-else
--include $(VDRSRC)/Make.global
--include $(VDRSRC)/Make.config
-endif
-
-export CXXFLAGS
-endif
+APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h) +APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
### The name of the distribution archive: ### The name of the distribution archive:
@@ -73,9 +40,7 @@ SOFILE = libvdr-$(PLUGIN).so @@ -48,7 +41,7 @@ SOFILE = libvdr-$(PLUGIN).so
### Includes and Defines (add further entries here): ### Includes and Defines (add further entries here):
-ifdef API1733 -INCLUDES +=
INCLUDES += -I$(VDRSRC)/include +INCLUDES += -I$(VDRDIR)/include
-endif
DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
@@ -145,6 +110,7 @@ $(DEPFILE): Makefile @@ -122,6 +115,7 @@ install-i18n: $(I18Nmsgs)
$(SOFILE): $(OBJS) $(FFDECSA) $(SOFILE): $(OBJS) $(FFDECSA)
$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(DECSALIB) -o $@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(DECSALIB) -o $@
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
libdvbapi-dvbsddevice.so: device-sd.o ifndef LIBDVBCSA
$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $< -o $@ $(FFDECSA): $(FFDECSADIR)/*.c $(FFDECSADIR)/*.h

13
packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-04_force-softcsa.patch vendored
View File

@ -1,13 +0,0 @@
diff --git a/device-tmpl.cpp b/device-tmpl.cpp
index 158324b..4d9f862 100644
--- a/device-tmpl.cpp
+++ b/device-tmpl.cpp
@@ -71,7 +71,7 @@ SCDEVICE::SCDEVICE(cScDevicePlugin *DevPlugin, int Adapter, int Frontend, int ca
fd_dvr = -1;
int n = Adapter;
- softcsa = (fd_ca < 0);
+ softcsa = true;
if (softcsa)
{
if (HasDecoder())