From: Jaroslav Kysela Date: Mon, 10 Apr 2017 07:09:18 +0000 (+0200) Subject: doozer/debian: build updates from PR #940 X-Git-Tag: v4.2.1~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce130eee124a1eefd17320a705b301cad5e45ebc;p=thirdparty%2Ftvheadend.git doozer/debian: build updates from PR #940 From: Mark Clarkstone --- diff --git a/.doozer.json b/.doozer.json index 8b327b1a4..b8fca0614 100644 --- a/.doozer.json +++ b/.doozer.json @@ -1,6 +1,6 @@ { + "concurrent": false, "targets": { - "precise-amd64": { "buildenv": "precise-amd64", "builddeps": [ @@ -17,15 +17,14 @@ "git-core", "liburiparser-dev", "python", - "dvb-apps" + "dvb-apps", + "debhelper", + "ccache" ], - "buildcmd": [ - "./configure --disable-dvbscan --enable-ffmpeg_static --disable-libx265_static --disable-libx265 --enable-hdhomerun_static", - "make -j ${PARALLEL}" + "AUTOBUILD_CONFIGURE_EXTRA=--disable-bintray_cache\\ --enable-ccache\\ --disable-libx265_static\\ --disable-libx265\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}" ] }, - "precise-i386": { "buildenv": "precise-i386", "builddeps": [ @@ -42,15 +41,14 @@ "git-core", "liburiparser-dev", "python", - "dvb-apps" + "dvb-apps", + "debhelper", + "ccache" ], - "buildcmd": [ - "./configure --disable-dvbscan --enable-ffmpeg_static --disable-libx265_static --disable-libx265 --enable-hdhomerun_static", - "make -j ${PARALLEL}" + "AUTOBUILD_CONFIGURE_EXTRA=--disable-bintray_cache\\ --enable-ccache\\ --disable-libx265_static\\ --disable-libx265\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}" ] }, - "trusty-amd64": { "buildenv": "trusty-amd64", "builddeps": [ @@ -67,15 +65,14 @@ "git-core", "liburiparser-dev", "python", - "dvb-apps" + "dvb-apps", + "debhelper", + "ccache" ], - "buildcmd": [ - "./configure --disable-dvbscan --enable-ffmpeg_static --enable-hdhomerun_static", - "make -j ${PARALLEL}" + "AUTOBUILD_CONFIGURE_EXTRA=--disable-bintray_cache\\ --enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}" ] }, - "trusty-i386": { "buildenv": "trusty-i386", "builddeps": [ @@ -92,15 +89,14 @@ "git-core", "liburiparser-dev", "python", - "dvb-apps" + "dvb-apps", + "debhelper", + "ccache" ], - "buildcmd": [ - "./configure --disable-dvbscan --enable-ffmpeg_static --enable-hdhomerun_static", - "make -j ${PARALLEL}" + "AUTOBUILD_CONFIGURE_EXTRA=--disable-bintray_cache\\ --enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}" ] }, - "xenial-amd64": { "buildenv": "xenial-amd64", "builddeps": [ @@ -117,12 +113,132 @@ "git-core", "liburiparser-dev", "python", - "dvb-apps" + "dvb-apps", + "debhelper", + "ccache" ], - "buildcmd": [ - "./configure --disable-dvbscan --enable-ffmpeg_static --enable-hdhomerun_static", - "make -j ${PARALLEL}" + "AUTOBUILD_CONFIGURE_EXTRA=--disable-bintray_cache\\ --enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}" + ] + }, + "xenial-i386": { + "buildenv": "xenial-i386", + "builddeps": [ + "cmake", + "git", + "build-essential", + "pkg-config", + "gettext", + "libavahi-client-dev", + "libssl-dev", + "zlib1g-dev", + "wget", + "bzip2", + "git-core", + "liburiparser-dev", + "python", + "dvb-apps", + "debhelper", + "ccache" + ], + "buildcmd": [ + "AUTOBUILD_CONFIGURE_EXTRA=--disable-bintray_cache\\ --enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}" + ] + }, + "jessie-i386": { + "buildenv": "jessie-i386", + "builddeps": [ + "cmake", + "git", + "build-essential", + "pkg-config", + "gettext", + "libavahi-client-dev", + "libssl-dev", + "zlib1g-dev", + "wget", + "bzip2", + "git-core", + "liburiparser-dev", + "python", + "dvb-apps", + "debhelper", + "ccache" + ], + "buildcmd": [ + "AUTOBUILD_CONFIGURE_EXTRA=--disable-bintray_cache\\ --enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}" + ] + }, + "jessie-amd64": { + "buildenv": "jessie-amd64", + "builddeps": [ + "cmake", + "git", + "build-essential", + "pkg-config", + "gettext", + "libavahi-client-dev", + "libssl-dev", + "zlib1g-dev", + "wget", + "bzip2", + "git-core", + "liburiparser-dev", + "python", + "dvb-apps", + "debhelper", + "ccache" + ], + "buildcmd": [ + "AUTOBUILD_CONFIGURE_EXTRA=--disable-bintray_cache\\ --enable-ccache\\ --enable-ffmpeg_static\\ --enable-hdhomerun_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}" + ] + }, + "xenial-armhf": { + "buildenv": "xenial-armhf", + "builddeps": [ + "cmake", + "git", + "build-essential", + "pkg-config", + "gettext", + "libavahi-client-dev", + "libssl-dev", + "zlib1g-dev", + "wget", + "bzip2", + "git-core", + "liburiparser-dev", + "python", + "dvb-apps", + "debhelper", + "ccache" + ], + "buildcmd": [ + "AUTOBUILD_CONFIGURE_EXTRA=--disable-bintray_cache\\ --enable-ccache\\ --enable-hdhomerun_static\\ --disable-ffmpeg_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}" + ] + }, + "xenial-arm64": { + "buildenv": "xenial-arm64", + "builddeps": [ + "cmake", + "git", + "build-essential", + "pkg-config", + "gettext", + "libavahi-client-dev", + "libssl-dev", + "zlib1g-dev", + "wget", + "bzip2", + "git-core", + "liburiparser-dev", + "python", + "dvb-apps", + "debhelper", + "ccache" + ], + "buildcmd": [ + "AUTOBUILD_CONFIGURE_EXTRA=--disable-bintray_cache\\ --enable-ccache\\ --enable-hdhomerun_static\\ --disable-ffmpeg_static ./Autobuild.sh -t ${TARGET} -j ${PARALLEL} -w ${WORKDIR}" ] } } diff --git a/Autobuild/debian.sh b/Autobuild/debian.sh index d7a2c2c01..625cc61ab 100755 --- a/Autobuild/debian.sh +++ b/Autobuild/debian.sh @@ -11,6 +11,17 @@ build() export JOBSARGS export JARGS export AUTOBUILD_CONFIGURE_EXTRA + + if ccache=$(which ccache); then + echo "Using ccache" + ccache -s + USE_CCACHE="--ccache" + else + USE_CCACHE="" + fi + + export USE_CCACHE + dpkg-buildpackage -b -us -uc for a in ../tvheadend*${VER}*.deb; do diff --git a/Autobuild/lucid-amd64.sh b/Autobuild/lucid-amd64.sh deleted file mode 100644 index cd2820fa3..000000000 --- a/Autobuild/lucid-amd64.sh +++ /dev/null @@ -1,3 +0,0 @@ -AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=x86_64" -DEBDIST=lucid -source Autobuild/debian.sh diff --git a/Autobuild/lucid-i386.sh b/Autobuild/lucid-i386.sh deleted file mode 100644 index 2e40b3766..000000000 --- a/Autobuild/lucid-i386.sh +++ /dev/null @@ -1,3 +0,0 @@ -AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=i686" -DEBDIST=lucid -source Autobuild/debian.sh diff --git a/Autobuild/vivid-amd64.sh b/Autobuild/vivid-amd64.sh deleted file mode 100644 index 94037b033..000000000 --- a/Autobuild/vivid-amd64.sh +++ /dev/null @@ -1,3 +0,0 @@ -AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=x86_64" -DEBDIST=vivid -source Autobuild/debian.sh diff --git a/Autobuild/vivid-i386.sh b/Autobuild/vivid-i386.sh deleted file mode 100644 index 6c762b37d..000000000 --- a/Autobuild/vivid-i386.sh +++ /dev/null @@ -1,3 +0,0 @@ -AUTOBUILD_CONFIGURE_EXTRA="${AUTOBUILD_CONFIGURE_EXTRA:-} --arch=i686" -DEBDIST=vivid -source Autobuild/debian.sh diff --git a/debian/control b/debian/control index 1fed51bab..aa2673c6e 100644 --- a/debian/control +++ b/debian/control @@ -2,12 +2,12 @@ Source: tvheadend Section: video Priority: extra Maintainer: Adam Sutton -Build-Depends: debhelper (>= 7.0.50), pkg-config, gettext, libavahi-client-dev, libssl-dev, zlib1g-dev, wget, bzip2, libcurl4-gnutls-dev, git-core, liburiparser-dev, python, curl, ca-certificates, cmake, dvb-apps +Build-Depends: debhelper (>= 7.0.50), pkg-config, gettext, libavahi-client-dev, libssl-dev, zlib1g-dev, wget, bzip2, git-core, liburiparser-dev, python, ca-certificates, cmake, dvb-apps Standards-Version: 3.7.3 Package: tvheadend Architecture: any -Depends: ${shlibs:Depends}, libavahi-client3, zlib1g, liburiparser1 +Depends: ${shlibs:Depends}, libavahi-client3, zlib1g, liburiparser1, dvb-apps, bzip2 Recommends: xmltv-util Enhances: showtime Replaces: hts-tvheadend