BS: bump libdvbsi Git ff57e5; add script

diff --git a/make/archives.mk b/make/archives.mk
index c0b0749317804c6bfd23630e1a065087487bcea5..dd6ba55f024e04f657bfcfb104907b6ee4cb6dc0 100755 (executable)
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -45,8 +45,8 @@ $(ARCHIVE)/libjpeg-turbo-$(JPEG_TURBO_VER).tar.gz:
 $(ARCHIVE)/libbluray-0.5.0.tar.bz2:
        $(WGET) http://www.fhloston-paradise.de/libbluray-0.5.0.tar.bz2
 
-$(ARCHIVE)/libdvbsi++-$(LIBDVBSI_VER).tar.bz2:
-       $(WGET) http://www.saftware.de/libdvbsi++/libdvbsi++-$(LIBDVBSI_VER).tar.bz2
+$(ARCHIVE)/libdvbsi++-$(LIBDVBSI_GIT).tar.bz2: | $(HOSTPREFIX)/bin/get-git-archive.sh
+       get-git-archive.sh git://git.opendreambox.org/git/obi/libdvbsi++.git $(LIBDVBSI_GIT) $(notdir $@) $(ARCHIVE)
 
 $(ARCHIVE)/libsigc++-$(LIBSIGC_VER).tar.xz:
        $(WGET) https://download.gnome.org/sources/libsigc++/$(LIBSIGC_MAJ).$(LIBSIGC_MIN)/libsigc++-$(LIBSIGC_VER).tar.xz

diff --git a/make/libraries.mk b/make/libraries.mk
index 4258ccbaba700b11dfa6bd1f5346db2c05254980..6364c68d81e75c2c136acb4686c2abdbe866f084 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -499,20 +499,20 @@ $(D)/ffmpeg: $(D)/librtmp $(D)/libxml2 | $(TARGETPREFIX)
        $(REMOVE)/ffmpeg $(TARGETPREFIX)/.remove
        touch $@
 
-$(D)/libdvbsi++: $(ARCHIVE)/libdvbsi++-$(LIBDVBSI_VER).tar.bz2 | $(TARGETPREFIX)
-       $(UNTAR)/libdvbsi++-$(LIBDVBSI_VER).tar.bz2
-       pushd $(BUILD_TMP)/libdvbsi++-$(LIBDVBSI_VER); \
-                       $(PATCH)/libdvbsi++-src-time_date_section.cpp-fix-sectionLength-check.patch; \
-                       $(PATCH)/libdvbsi++-fix-unaligned-access-on-SuperH.patch; \
-                       $(PATCH)/libdvbsi++-content_identifier_descriptor.patch; \
-                       $(CONFIGURE) \
-                               --prefix=$(TARGETPREFIX) \
-                               --build=$(BUILD) \
-                               --host=$(TARGET); \
-                       $(MAKE); \
-                       $(MAKE) install
+$(D)/libdvbsi++: $(ARCHIVE)/libdvbsi++-$(LIBDVBSI_GIT).tar.bz2 | $(TARGETPREFIX)
+       $(UNTAR)/libdvbsi++-$(LIBDVBSI_GIT).tar.bz2
+       pushd $(BUILD_TMP)/libdvbsi++-$(LIBDVBSI_GIT); \
+               $(PATCH)/libdvbsi++-src-time_date_section.cpp-fix-sectionLength-check.patch; \
+               $(PATCH)/libdvbsi++-fix-unaligned-access-on-SuperH.patch; \
+               $(PATCH)/libdvbsi++-content_identifier_descriptor.patch; \
+               $(CONFIGURE) \
+                       --prefix=$(TARGETPREFIX) \
+                       --build=$(BUILD) \
+                       --host=$(TARGET); \
+               $(MAKE); \
+               $(MAKE) install
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libdvbsi++.pc
-       $(REMOVE)/libdvbsi++-$(LIBDVBSI_VER)
+       $(REMOVE)/libdvbsi++-$(LIBDVBSI_GIT)
        touch $@
 
 $(D)/libsigc: $(ARCHIVE)/libsigc++-$(LIBSIGC_VER).tar.xz | $(TARGETPREFIX)

diff --git a/make/versions.mk b/make/versions.mk
index 0c80fdc624deffcb9f362aae417e6ea27d2b1a8e..802ae361a4fe5e9a33ff5a94c020a8e4cc8cc386 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -48,7 +48,7 @@ HD_IDLE_VER=1.04
 JPEG_TURBO_VER = 1.4.2
 
 # libdvbsi++; libdvbsi++ is a open source C++ library for parsing DVB Service Information and MPEG-2 Program Specific Information.
-LIBDVBSI_VER=0.3.7
+LIBDVBSI_GIT=ff57e5
 
 # libpng; reference library for reading and writing PNGs
 PNG_VER=1.6.21

diff --git a/scripts/get-git-archive.sh b/scripts/get-git-archive.sh
new file mode 100755 (executable)
index 0000000..1e550d2
--- /dev/null
+++ b/scripts/get-git-archive.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+#
+# get a specified git version as tarball
+#
+# (C) 2013 Stefan Seyfried
+# License: WTFPLv2
+#
+# parameters:
+# * git URL
+# * git tag/tree-ish to archive
+# * archive name (.tar.bz2 will be stripped off)
+# * archive/download directory
+#
+# *** no matter the archive name, it will always be compressed with bzip2 ***
+#
+GIT_URL="$1"
+GIT_TAG="$2"
+TAR_NAME="$3"
+ARCHIVE="$4"
+test -z "$ARCHIVE" && ARCHIVE="$PWD"
+
+TAR_PATH=${TAR_NAME%.tar*}
+
+DIR=$(mktemp -d $PWD/git_archive.XXXXXX)
+# clean up at exit
+trap "rm -rf $DIR" EXIT
+# exit on error
+set -e
+git clone $GIT_URL $DIR
+cd $DIR
+git reset --hard $GIT_TAG
+git archive -o $TAR_PATH.tar --prefix=$TAR_PATH/ $GIT_TAG
+bzip2 $TAR_PATH.tar
+mv $TAR_PATH.tar.bz2 $ARCHIVE/
+# exit trap cleans up...