[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c39413f2d59c04f2d6051d737abbb2c89e203ec1 - IPFire-SCM

3 Mar 2014

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
       via  c39413f2d59c04f2d6051d737abbb2c89e203ec1 (commit)
       via  d1dee6c1a1190868a8f6b21f1b63d45a73917f41 (commit)
       via  ece4c8cdc3146b39797c01241a8355be54f31888 (commit)
       via  fa49910fa8cb713c9df965891aff257e6fd2832e (commit)
      from  fb5132aa57e40e52aa0571020d26c12236f48310 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c39413f2d59c04f2d6051d737abbb2c89e203ec1
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Mon Mar 3 16:41:13 2014 +0100
vdr: Add eepg plugin.
commit d1dee6c1a1190868a8f6b21f1b63d45a73917f41
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Mon Mar 3 16:31:27 2014 +0100
vdr: Add DVBAPI plugin.
commit ece4c8cdc3146b39797c01241a8355be54f31888
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Mon Mar 3 16:28:51 2014 +0100
vdr: Update to 2.0.5.
Stupid outdated websites...
commit fa49910fa8cb713c9df965891aff257e6fd2832e
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Mon Mar 3 13:50:37 2014 +0100
vdr: Update to 2.0.4.
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/packages/armv5tel/vdr_dvbapi |  3 ++
 config/rootfiles/packages/i586/vdr_dvbapi     |  4 ++
 config/rootfiles/packages/vdr_eepg            |  2 +
 lfs/vdr                                       |  8 ++--
 lfs/{vdr_streamdev => vdr_dvbapi}             | 65 ++++++++++++++++-----------
 lfs/{vdr_vnsiserver3 => vdr_eepg}             | 26 +++++------
 make.sh                                       |  2 +
 7 files changed, 68 insertions(+), 42 deletions(-)
 create mode 100644 config/rootfiles/packages/armv5tel/vdr_dvbapi
 create mode 100644 config/rootfiles/packages/i586/vdr_dvbapi
 create mode 100644 config/rootfiles/packages/vdr_eepg
 copy lfs/{vdr_streamdev => vdr_dvbapi} (67%)
 copy lfs/{vdr_vnsiserver3 => vdr_eepg} (85%)
Difference in files:

diff --git a/config/rootfiles/packages/armv5tel/vdr_dvbapi b/config/rootfiles/packages/armv5tel/vdr_dvbapi
new file mode 100644
index 0000000..0748137
--- /dev/null
+++ b/config/rootfiles/packages/armv5tel/vdr_dvbapi
@@ -0,0 +1,3 @@
+etc/sysconfig/vdr-plugins.d/dvbapi.conf
+etc/vdr/plugins/dvbapi
+usr/lib/vdr/libvdr-dvbapi.so.2.0.0
diff --git a/config/rootfiles/packages/i586/vdr_dvbapi b/config/rootfiles/packages/i586/vdr_dvbapi
new file mode 100644
index 0000000..5e06c12
--- /dev/null
+++ b/config/rootfiles/packages/i586/vdr_dvbapi
@@ -0,0 +1,4 @@
+etc/sysconfig/vdr-plugins.d/dvbapi.conf
+etc/vdr/plugins/dvbapi
+usr/lib/vdr/libvdr-dvbapi.so.2.0.0
+usr/lib/vdr/libvdr-dvbapi.so.2.0.0-sse
diff --git a/config/rootfiles/packages/vdr_eepg b/config/rootfiles/packages/vdr_eepg
new file mode 100644
index 0000000..17f7bc4
--- /dev/null
+++ b/config/rootfiles/packages/vdr_eepg
@@ -0,0 +1,2 @@
+etc/vdr/plugins/eepg
+usr/lib/vdr/libvdr-eepg.so.2.0.0
diff --git a/lfs/vdr b/lfs/vdr
index 161b04e..52ecdd5 100644
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -24,7 +24,7 @@
include Config
-VER        = 2.0.3
+VER        = 2.0.5
# VDRPLUGVER must match with APIVERSION in config.h
 # after change this update also all vdr plugins
@@ -37,7 +37,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vdr
-PAK_VER    = 8
+PAK_VER    = 9
DEPS       = "vdr_streamdev"
@@ -63,9 +63,9 @@ MAKE_OPTIONS = \
objects = $(DL_FILE)
-$(DL_FILE)  = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5  = dd8fb1642bdfa7feb0e9a8ae41e9ef2f
+$(DL_FILE)_MD5 = f58b9836a60440fde84480a2e37ee91d
install : $(TARGET)
diff --git a/lfs/vdr_dvbapi b/lfs/vdr_dvbapi
new file mode 100644
index 0000000..2cf34e7
--- /dev/null
+++ b/lfs/vdr_dvbapi
@@ -0,0 +1,121 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2013  IPFire Team  info@ipfire.org                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see http://www.gnu.org/licenses/.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.0.6
+THISAPP    = vdr-plugin-dvbapi-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = vdr_dvbapi
+PAK_VER    = 1
+
+DEPS       = ""
+
+VDRPLUGVER = 2.0.0
+
+EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+CFLAGS    += $(EXTRA_FLAGS)
+CXXFLAGS  += $(EXTRA_FLAGS)
+
+CSAFLAGS     =  -O3 -fexpensive-optimizations -funroll-loops
+CSAFLAGS-sse = $(CSAFLAGS) -mmmx -msse -msse2 -msse3
+PARALLEL     = PARALLEL_64_LONG
+PARALLEL-sse = PARALLEL_128_SSE2
+
+define BUILD
+	cp -a $(DIR_APP) $(DIR_APP)-build$(1)
+	cd $(DIR_APP)-build$(1) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \
+		CFLAGS="$(CFLAGS$(1))" CXXFLAGS="$(CXXFLAGS$(1))" \
+		CSAFLAGS="$(CSAFLAGS$(1))" PARALLEL="$(PARALLEL$(1))" \
+		LOCALEDIR=$$(pwd)/locale all
+
+	-mkdir -pv /etc/vdr/plugins/dvbapi
+	cd $(DIR_APP)-build$(1) && install -m 755 libvdr-dvbapi.so \
+		/usr/lib/vdr/libvdr-dvbapi.so.$(VDRPLUGVER)$(1)
+endef
+
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 6a8024b2970beba8eadc1acaa86805e7
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download : $(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+	@$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP)* && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+
+ifeq "$(MACHINE)" "i586"
+	# Build an SSE enabled version.
+	$(call BUILD,-sse)
+endif
+
+	# Build normal version.
+	$(call BUILD)
+
+	echo "#" > /etc/sysconfig/vdr-plugins.d/dvbapi.conf
+	echo "# Command line parameters for vdr-plugin-dvbapi" >> /etc/sysconfig/vdr-plugins.d/dvbapi.conf
+	echo "#" >> /etc/sysconfig/vdr-plugins.d/dvbapi.conf
+	echo "# For more details see:" >> /etc/sysconfig/vdr-plugins.d/dvbapi.conf
+	echo "#   - `vdr --help -Pdvbapi`" >> /etc/sysconfig/vdr-plugins.d/dvbapi.conf
+	echo "PLUGIN_OPTIONS=""" >> /etc/sysconfig/vdr-plugins.d/dvbapi.conf
+
+	@rm -rf $(DIR_APP)*
+	@$(POSTBUILD)
diff --git a/lfs/vdr_eepg b/lfs/vdr_eepg
new file mode 100644
index 0000000..fddd075
--- /dev/null
+++ b/lfs/vdr_eepg
@@ -0,0 +1,99 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2013  IPFire Team  info@ipfire.org                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see http://www.gnu.org/licenses/.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+GIT_VER    = 69b47ba4bf0195fd6820beb2cf4f7c7ea31f4011
+VER        = master
+THISAPP    = vdr-plugin-eepg-$(VER)
+DL_FILE    = vdr-plugin-eepg-$(GIT_VER).tar.bz2
+
+DL_FROM    = http://projects.vdr-developer.org/git/vdr-plugin-eepg.git/snapshot
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = vdr_eepg
+PAK_VER    = 1
+
+DEPS       = ""
+
+VDRPLUGVER = 2.0.0
+
+EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+CFLAGS    += $(EXTRA_FLAGS)
+CXXFLAGS  += $(EXTRA_FLAGS)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE)  = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5  = 0d8049949263f9a2b8deb2ae9919bc49
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download : $(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+	@$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+
+	cd $(DIR_SRC) && mv vdr-plugin-eepg-$(GIT_VER) $(THISAPP)
+
+	cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \
+		CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+		LOCALEDIR=$$(pwd)/locale all
+
+	mkdir -pv /etc/vdr/plugins/eepg
+	cd $(DIR_APP) && install -m 755 libvdr-eepg.so \
+		/usr/lib/vdr/libvdr-eepg.so.$(VDRPLUGVER)
+
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 50fca8f..c9c5a71 100755
--- a/make.sh
+++ b/make.sh
@@ -681,6 +681,8 @@ buildipfire() {
   ipfiremake vdr_streamdev
   ipfiremake vdr_vnsiserver3
   ipfiremake vdr_epgsearch
+  ipfiremake vdr_dvbapi
+  ipfiremake vdr_eepg
   ipfiremake w_scan
   ipfiremake icecast
   ipfiremake icegenerator
hooks/post-receive
--
IPFire 2.x development tree

    