LinGui: remove Ubuntu xenial and trusty from nightly builds

Neither of these support a recent enough version of nasm to build x265
with assembly optimizations.  Running without assembly optimizations
isn't acceptable, so just stop building these releases.

diff --git a/pkg/linux/debian/control.artful b/pkg/linux/debian/control.artful
index e47c9f8728571fe6fc9aa18c34196f7d4965f35f..bc99ddf44670c952ab112ffb98b7da676e83e1a4 100644 (file)
--- a/pkg/linux/debian/control.artful
+++ b/pkg/linux/debian/control.artful
@@ -2,7 +2,7 @@ Source: handbrake
 Section: graphics
 Priority: optional
 Maintainer: John Stebbins <jstebbins.hb@gmail.com>
-Build-Depends: debhelper (>= 6), autotools-dev, libtool, libtool-bin, libgudev-1.0-dev, intltool, autoconf, yasm (>= 1.2.0), cmake, libbz2-dev, zlib1g-dev, libgtk-3-dev, libwebkitgtk-3.0-dev, libnotify-dev, libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, python (>= 2.6), libappindicator3-dev, libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libopus-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev, libmp3lame-dev, libx264-dev, libjansson-dev, libspeex-dev
+Build-Depends: debhelper (>= 6), autotools-dev, libtool, libtool-bin, libgudev-1.0-dev, intltool, autoconf, nasm (>= 2.13), yasm (>= 1.2.0), cmake, libbz2-dev, zlib1g-dev, libgtk-3-dev, libwebkitgtk-3.0-dev, libnotify-dev, libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, python (>= 2.6), libappindicator3-dev, libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libopus-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev, libmp3lame-dev, libx264-dev, libjansson-dev, libspeex-dev
 Standards-Version: 3.8.4
 Homepage: http://www.handbrake.fr/
 

diff --git a/pkg/linux/debian/control.bionic b/pkg/linux/debian/control.bionic
index efd3b2948713feb66b7d6b97b808f5406fe44b96..4584078982154beddd9e0027724a22a67e5873d7 100644 (file)
--- a/pkg/linux/debian/control.bionic
+++ b/pkg/linux/debian/control.bionic
@@ -2,7 +2,7 @@ Source: handbrake
 Section: graphics
 Priority: optional
 Maintainer: John Stebbins <jstebbins.hb@gmail.com>
-Build-Depends: debhelper (>= 6), autotools-dev, libtool, libtool-bin, libgudev-1.0-dev, intltool, autoconf, yasm (>= 1.2.0), cmake, libbz2-dev, zlib1g-dev, libgtk-3-dev, libwebkitgtk-3.0-dev, libnotify-dev, libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, python (>= 2.6), libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libopus-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev, libmp3lame-dev, libx264-dev, libjansson-dev, libspeex-dev
+Build-Depends: debhelper (>= 6), autotools-dev, libtool, libtool-bin, libgudev-1.0-dev, intltool, autoconf, nasm (>= 2.13), yasm (>= 1.2.0), cmake, libbz2-dev, zlib1g-dev, libgtk-3-dev, libwebkitgtk-3.0-dev, libnotify-dev, libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, python (>= 2.6), libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libopus-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev, libmp3lame-dev, libx264-dev, libjansson-dev, libspeex-dev
 Standards-Version: 3.8.4
 Homepage: http://www.handbrake.fr/
 

diff --git a/pkg/linux/module.rules b/pkg/linux/module.rules
index 925345018d0df3b9819c3116433255f7367d97c9..bf9f48ed208224ded5aaa7ab0b15e953321f9183 100644 (file)
--- a/pkg/linux/module.rules
+++ b/pkg/linux/module.rules
@@ -117,8 +117,6 @@ $(PKG.cli.deb): $(PKG.gui.tmp.deb)
 pkg.push.src.deb:: $(PKG.src.deb.stamp)
        (cd $(STAGE.out.src/)bionic && dput handbrake-git-snapshots $(HB.name.lower)_$(HB.debversion)-zhb-1ppa1~bionic1_source.changes )
        (cd $(STAGE.out.src/)artful && dput handbrake-git-snapshots $(HB.name.lower)_$(HB.debversion)-zhb-1ppa1~artful1_source.changes )
-       (cd $(STAGE.out.src/)xenial && dput handbrake-git-snapshots $(HB.name.lower)_$(HB.debversion)-zhb-1ppa1~xenial1_source.changes )
-       (cd $(STAGE.out.src/)trusty && dput handbrake-git-snapshots $(HB.name.lower)_$(HB.debversion)-zhb-1ppa1~trusty1_source.changes )
 
 $(PKG.src.deb.stamp): GNUmakefile
        -$(RM.exe) -rf $(STAGE.out.src/)
@@ -151,31 +149,3 @@ $(PKG.src.deb.stamp): GNUmakefile
        echo " -- John Stebbins <jstebbins.hb@gmail.com>  $(DEBIAN_CHANGELOG_DATE)" >> $(STAGE.out.src/)artful/$(PKG.deb.basename)/debian/changelog
        $(TAR.exe) czf $(STAGE.out.src/)artful/$(PKG.src.deb.tar) -C $(STAGE.out.src/)artful $(PKG.deb.basename)
        (cd $(STAGE.out.src/)artful/$(PKG.deb.basename) && debuild -S -kjstebbins.hb)
-       $(MKDIR.exe) -p $(STAGE.out.src/)xenial
-       $(GIT.exe) -C $(SRC/) archive --format=tar --prefix=$(PKG.deb.basename)/ $(HB.repo.shorthash) | $(TAR.exe) -xC $(STAGE.out.src/)xenial/
-       $(SRC/)scripts/repo-info.sh $(SRC/) > $(STAGE.out.src/)xenial/$(PKG.deb.basename)/version.txt
-       $(CP.exe) -a $(SRC/)download $(STAGE.out.src/)xenial/$(PKG.deb.basename)
-       cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)xenial/$(PKG.deb.basename)
-       $(CP.exe) $(STAGE.out.src/)xenial/$(PKG.deb.basename)/debian/control.xenial $(STAGE.out.src/)xenial/$(PKG.deb.basename)/debian/control
-       $(CP.exe) $(STAGE.out.src/)xenial/$(PKG.deb.basename)/debian/rules.xenial $(STAGE.out.src/)xenial/$(PKG.deb.basename)/debian/rules
-       echo "$(HB.name.lower) ($(HB.debversion)-zhb-1ppa1~xenial1) xenial; urgency=low" > $(STAGE.out.src/)xenial/$(PKG.deb.basename)/debian/changelog
-       echo "  * Snapshot" >> $(STAGE.out.src/)xenial/$(PKG.deb.basename)/debian/changelog
-       echo "    - See commit history at https://github.com/HandBrake/HandBrake/commits/master" >> $(STAGE.out.src/)xenial/$(PKG.deb.basename)/debian/changelog
-       echo "" >> $(STAGE.out.src/)xenial/$(PKG.deb.basename)/debian/changelog
-       echo " -- John Stebbins <jstebbins.hb@gmail.com>  $(DEBIAN_CHANGELOG_DATE)" >> $(STAGE.out.src/)xenial/$(PKG.deb.basename)/debian/changelog
-       $(TAR.exe) czf $(STAGE.out.src/)xenial/$(PKG.src.deb.tar) -C $(STAGE.out.src/)xenial $(PKG.deb.basename)
-       (cd $(STAGE.out.src/)xenial/$(PKG.deb.basename) && debuild -S -kjstebbins.hb)
-       $(MKDIR.exe) -p $(STAGE.out.src/)trusty
-       $(GIT.exe) -C $(SRC/) archive --format=tar --prefix=$(PKG.deb.basename)/ $(HB.repo.shorthash) | $(TAR.exe) -xC $(STAGE.out.src/)trusty/
-       $(SRC/)scripts/repo-info.sh $(SRC/) > $(STAGE.out.src/)trusty/$(PKG.deb.basename)/version.txt
-       $(CP.exe) -a $(SRC/)download $(STAGE.out.src/)trusty/$(PKG.deb.basename)
-       cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)trusty/$(PKG.deb.basename)
-       $(CP.exe) $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/control.trusty $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/control
-       $(CP.exe) $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/rules.trusty $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/rules
-       echo "$(HB.name.lower) ($(HB.debversion)-zhb-1ppa1~trusty1) trusty; urgency=low" > $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/changelog
-       echo "  * Snapshot" >> $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/changelog
-       echo "    - See commit history at https://github.com/HandBrake/HandBrake/commits/master" >> $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/changelog
-       echo "" >> $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/changelog
-       echo " -- John Stebbins <jstebbins.hb@gmail.com>  $(DEBIAN_CHANGELOG_DATE)" >> $(STAGE.out.src/)trusty/$(PKG.deb.basename)/debian/changelog
-       $(TAR.exe) czf $(STAGE.out.src/)trusty/$(PKG.src.deb.tar) -C $(STAGE.out.src/)trusty $(PKG.deb.basename)
-       (cd $(STAGE.out.src/)trusty/$(PKG.deb.basename) && debuild -S -kjstebbins.hb)