From 1f1a090d5703f67648bdaee8cbf59b0ca0432be2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 9 Dec 2012 22:54:20 +0000 Subject: [PATCH] Various hacks to deb builds. --- builds/{deb-12.04 => chroot-deb} | 9 ++++++-- builds/control-12.04 | 2 +- builds/deb | 24 +++++++++++++++++++++ builds/deb-12.10 | 22 ------------------- builds/ubuntu-12.04-64 | 36 -------------------------------- 5 files changed, 32 insertions(+), 61 deletions(-) rename builds/{deb-12.04 => chroot-deb} (75%) create mode 100755 builds/deb delete mode 100755 builds/deb-12.10 delete mode 100755 builds/ubuntu-12.04-64 diff --git a/builds/deb-12.04 b/builds/chroot-deb similarity index 75% rename from builds/deb-12.04 rename to builds/chroot-deb index ab1469e87..a0f5f7d85 100755 --- a/builds/deb-12.04 +++ b/builds/chroot-deb @@ -1,6 +1,12 @@ #!/bin/bash -e -cp builds/control-12.04 debian/ +UBUNTU_VERSION=$1 +if [ "$UBUNTU_VERSION" == "" ]; then + echo "Syntax: $0 " + exit 1 +fi + +cp builds/control-$UBUNTU_VERSION debian/control ./waf dist TARBALL=`ls -1 *.tar.bz2` VERSION=`echo $TARBALL | sed -e 's/^dvdomatic-\(.*\).tar.bz2/\1/'` @@ -19,4 +25,3 @@ cd dvdomatic-* dpkg-source -b . dpkg-buildpackage cp ../*.deb ../../../ - diff --git a/builds/control-12.04 b/builds/control-12.04 index f47058bcc..a1d12a506 100644 --- a/builds/control-12.04 +++ b/builds/control-12.04 @@ -2,7 +2,7 @@ Source: dvdomatic Section: video Priority: extra Maintainer: Carl Hetherington -Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.7.2), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem1.49-dev (>= 1.49.0), libboost-thread1.49-dev (>= 1.49.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.7.7.10) +Build-Depends: debhelper (>= 8.0.0), python (>= 2.7.3), g++ (>= 4:4.6.3), pkg-config (>= 0.26), libwxgtk2.8-dev (>= 2.8.12.1), libssh-dev (>= 0.5.2), libboost-filesystem-dev (>= 1.46.0), libboost-thread-dev (>= 1.46.0), libsndfile1-dev (>= 1.0.25), libmagick++-dev (>= 8:6.6.9.7) Standards-Version: 3.9.3 Homepage: http://carlh.net/software/dvdomatic diff --git a/builds/deb b/builds/deb new file mode 100755 index 000000000..8bf5d357b --- /dev/null +++ b/builds/deb @@ -0,0 +1,24 @@ +#!/bin/bash -e + +UBUNTU_VERSION=$1 +BITS=$2 +if [ "$UBUNTU_VERSION" == "" -o "$BITS" == "" ]; then + echo "Syntax: $0 " + exit 1 +fi + +ID=$UBUNTU_VERSION-$BITS +CHROOT=/home/carl/Environments/ubuntu-$ID +TARBALL=`ls -1 *.tar.bz2` +VERSION=`echo $TARBALL | sed -e 's/^dvdomatic-\(.*\).tar.bz2/\1/'` + +echo "ID: $ID" +echo "chroot: $CHROOT" +echo "tarball: $TARBALL" +echo "version: $VERSION" + +sudo cp *.tar.bz2 $CHROOT/root/ +sudo schroot -c "ubuntu-$ID" -d /root -u root -- /bin/sh -c "tar xjf dvdomatic-$VERSION.tar.bz2 && cd dvdomatic-$VERSION && builds/chroot-deb $UBUNTU_VERSION" +mkdir -p build/deb/$ID/ +sudo cp $CHROOT/root/dvdomatic-$VERSION/build/deb/dvdomatic_$VERSION-1_i386.deb build/deb/$ID + diff --git a/builds/deb-12.10 b/builds/deb-12.10 deleted file mode 100755 index ec206fdb1..000000000 --- a/builds/deb-12.10 +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -e - -cp builds/control-12.10 debian/ -./waf dist -TARBALL=`ls -1 *.tar.bz2` -VERSION=`echo $TARBALL | sed -e 's/^dvdomatic-\(.*\).tar.bz2/\1/'` - -echo "dvdomatic_$VERSION-1_i386.deb video extra" > debian/files - -rm -rf build/deb -mkdir -p build/deb -cd build/deb -mv ../../*.tar.bz2 . -DEB_TARBALL="dvdomatic_$VERSION.orig.tar.bz2" -echo "Renaming $TARBALL to $DEB_TARBALL" -mv $TARBALL $DEB_TARBALL -tar xjf $DEB_TARBALL -cd dvdomatic-* -dpkg-source -b . -dpkg-buildpackage -cp ../*.deb ../../../ - diff --git a/builds/ubuntu-12.04-64 b/builds/ubuntu-12.04-64 deleted file mode 100755 index e5899ebd7..000000000 --- a/builds/ubuntu-12.04-64 +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -e - -export DEST=dvdomatic-ubuntu-12.04-64 -export ENV=/home/carl/Environments/ubuntu-12.04-64 - -./waf clean - -export PATH=$ENV/bin:$PATH -export PKG_CONFIG_LIBDIR=$ENV/lib/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig - -CXXFLAGS="-I$ENV_PREFIX/include" \ - LINKFLAGS="-L$ENV_PREFIX/lib" \ - ./waf configure - -./waf - -mkdir -p $DEST/bin -mkdir -p $DEST/lib -cp build/src/tools/makedcp $DEST/bin/makedcp-bin -cp build/src/lib/libdvdomatic.so $DEST/lib/ -cp build/src/wx/libdvdomatic-wx.so $DEST/lib/ -cp $ENV/lib/libdcp.so $DEST/lib -cp $ENV/lib/libasdcp-libdcp.so $DEST/lib -cp $ENV/lib/libkumu-libdcp.so $DEST/lib -cp $ENV/lib/libavcodec.so* $DEST/lib -cp $ENV/lib/libavutil.so* $DEST/lib -cp $ENV/lib/libavformat.so* $DEST/lib -cp $ENV/lib/libavfilter.so* $DEST/lib -cp $ENV/lib/libswscale.so* $DEST/lib -cp $ENV/lib/libswresample.so* $DEST/lib -cp $ENV/lib/libopenjpeg.so* $DEST/lib -cp $ENV/lib/libpostproc.so* $DEST/lib -cp $ENV/lib/libfaac.so* $DEST/lib -cp wrapper/makedcp $DEST/bin/ -tar -c $DEST | bzip2 -f -9 > $DEST.tar.bz2 - -- 2.30.2