From 21b84f6d0e56646ecb6c60f7538d32409ec38753 Mon Sep 17 00:00:00 2001 From: Kevin Mitchell Date: Sat, 1 Feb 2014 18:26:27 -0800 Subject: debian changelog hack put dummy UNRELEASED entry in changelog before build with dch -v "version" "localbuild". This has the "papercut" of repeating the "local build" bullet in the same entry each time the package is built. --- debian/changelog | 13 +++++++++++-- debian/control | 2 ++ debian/rules | 7 +++++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index e7475cc..011ebdf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,20 @@ -mpv (1:0.3.3-1) UNRELEASED; urgency=medium +mpv (0:0.3.4) stable; urgency=medium + + * changelog hack: add an "UNRELEASED" changelog entry by the + current user when the package is built with the currently checked + out mpv version. This has the "papercut" of repeating the + "local build" bullet in the same entry each time the package is built. + + -- Kevin Mitchell Sat, 01 Feb 2014 19:09:11 -0800 + +mpv (0:0.3.3-1) stable; urgency=medium * enable libx264 and libmp3lame in ffmpeg build * make building on multiple cores actually work -- Kevin Mitchell Wed, 29 Jan 2014 18:46:08 -0800 -mpv (1:0.3.3) UNRELEASED; urgency=low +mpv (0:0.3.3) stable; urgency=low * reimagine for waf build system * test building on saucy,precise,stable,sid amd64 diff --git a/debian/control b/debian/control index d961d69..7f7f2e3 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,9 @@ Build-Depends: automake, c-compiler, debhelper (>= 7), + devscripts, gcc-4.8 [powerpc powerpcspe sparc], + git, ladspa-sdk, libasound2-dev [linux-any], libbluray-dev, diff --git a/debian/rules b/debian/rules index 737a744..996041a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,4 @@ #! /usr/bin/make -f - # from official debian package: testing welcome! ifeq ($(DEB_HOST_ARCH_CPU),$(filter $(DEB_HOST_ARCH_CPU),powerpc sparc)) export CC=gcc-4.8 # fixes #73363 @@ -22,7 +21,7 @@ endif # Apparently, the above isn't enough because of the "%" target. Make the problematic targets explicit clean: exec dh $@ -build: +build: update_version exec dh $@ install: exec dh $@ @@ -32,6 +31,10 @@ install: %: exec dh $@ +MPV_VERSION=$(shell cd mpv && git describe --tags | sed 's/^v//';) +update_version: + dch -v "1:$(MPV_VERSION)" "local build" + # this should really create multiple shared object debian packages but # this will do for now # the dependencies must be built before mpv is configured -- cgit v1.2.3 From 5d1f9b8b88282ecd1e4f9805879eeb7fd143c606 Mon Sep 17 00:00:00 2001 From: Kevin Mitchell Date: Mon, 3 Feb 2014 11:16:10 -0800 Subject: !hurd-any for dependencies not available in debian hurd (libva,libv4l) --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 7f7f2e3..6879649 100644 --- a/debian/control +++ b/debian/control @@ -37,8 +37,8 @@ Build-Depends: libquvi-dev, libsmbclient-dev, libtool, - libv4l-dev, - libva-dev, + libv4l-dev [!hurd-any], + libva-dev [!hurd-any], libvdpau-dev, libwayland-dev [linux-any], libx264-dev, -- cgit v1.2.3 From 74fa7e69b8fbfab7735c98c9903bac4dcc90571d Mon Sep 17 00:00:00 2001 From: Kevin Mitchell Date: Mon, 3 Feb 2014 13:53:49 -0800 Subject: recommend libgl1-mesa-dri and suggest libaacs0 --- debian/control | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/control b/debian/control index 6879649..387d227 100644 --- a/debian/control +++ b/debian/control @@ -57,6 +57,8 @@ Build-Depends: Package: mpv Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: libgl1-mesa-dri +Suggests: libaacs0 Description: mplayer/mplayer2 based video player MPV is a versatile CLI movie player, based on mplayer and mplayer2. . -- cgit v1.2.3 From e4c487cba61e5649143f4a38ef38869b51f56fb2 Mon Sep 17 00:00:00 2001 From: Kevin Mitchell Date: Tue, 4 Feb 2014 20:18:37 -0800 Subject: Better changelog hack in separate script called from ./update. dpkg-buildpackage reads the changelog before ever calling debian/rules, so its not a good idea to change it from there. Move this to a separate script called from ./update which does not depend on any debian-specific commands. --- debian/changelog | 15 ++++++++++++- debian/control | 2 -- debian/rules | 7 ++---- scripts/debian-update-versions | 48 ++++++++++++++++++++++++++++++++++++++++++ update | 7 ++++++ 5 files changed, 71 insertions(+), 8 deletions(-) create mode 100755 scripts/debian-update-versions diff --git a/debian/changelog b/debian/changelog index 011ebdf..27e14bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +mpv (1:0.3.4) UNRELEASED; urgency=medium + + * local build + + -- Local User Tue, 04 Feb 2014 21:48:02 -0800 + +mpv (0:0.3.4-1) stable; urgency=medium + + * better changelog hack: debian build scripts read the version before + it gets updated. Do a sed in the ./update instead. + + -- Kevin Mitchell Tue, 04 Feb 2014 19:06:32 -0800 + mpv (0:0.3.4) stable; urgency=medium * changelog hack: add an "UNRELEASED" changelog entry by the @@ -5,7 +18,7 @@ mpv (0:0.3.4) stable; urgency=medium out mpv version. This has the "papercut" of repeating the "local build" bullet in the same entry each time the package is built. - -- Kevin Mitchell Sat, 01 Feb 2014 19:09:11 -0800 + -- Kevin Mitchell Sat, 01 Feb 2014 19:09:11 -0800 mpv (0:0.3.3-1) stable; urgency=medium diff --git a/debian/control b/debian/control index 387d227..f30dc9b 100644 --- a/debian/control +++ b/debian/control @@ -8,9 +8,7 @@ Build-Depends: automake, c-compiler, debhelper (>= 7), - devscripts, gcc-4.8 [powerpc powerpcspe sparc], - git, ladspa-sdk, libasound2-dev [linux-any], libbluray-dev, diff --git a/debian/rules b/debian/rules index 996041a..737a744 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,5 @@ #! /usr/bin/make -f + # from official debian package: testing welcome! ifeq ($(DEB_HOST_ARCH_CPU),$(filter $(DEB_HOST_ARCH_CPU),powerpc sparc)) export CC=gcc-4.8 # fixes #73363 @@ -21,7 +22,7 @@ endif # Apparently, the above isn't enough because of the "%" target. Make the problematic targets explicit clean: exec dh $@ -build: update_version +build: exec dh $@ install: exec dh $@ @@ -31,10 +32,6 @@ install: %: exec dh $@ -MPV_VERSION=$(shell cd mpv && git describe --tags | sed 's/^v//';) -update_version: - dch -v "1:$(MPV_VERSION)" "local build" - # this should really create multiple shared object debian packages but # this will do for now # the dependencies must be built before mpv is configured diff --git a/scripts/debian-update-versions b/scripts/debian-update-versions new file mode 100755 index 0000000..8102d0d --- /dev/null +++ b/scripts/debian-update-versions @@ -0,0 +1,48 @@ +#!/bin/sh + +get_version() +{ + ( + cd $1 + git describe --tags | sed 's/^[^0-9]*//' + ) +} + +get_timestamp_commit() +{ + ( + cd $1 + TIMESTAMP=$(git log -1 --date=short --format=%cd | sed 's/-/./g') + COMMIT=$(git rev-parse --short HEAD) + echo ${TIMESTAMP}.${COMMIT} + ) +} + +do_subst() { + sed -i "0,/^mpv (.*)/s/(.*)/(1:$1)/" debian/changelog + sed -i "s/^ \* local build.*/ \* local build with ffmpeg $2, libass $3/" debian/changelog + sed -i "s/\(^ -- Local User \).*/\1 $(date -R)/" debian/changelog +} + +do_version_all() { + do_subst $(get_version mpv) $(get_version ffmpeg) $(get_version libass) +} + +do_timestamp_commit_all() { + do_subst $(get_timestamp_commit mpv) $(get_timestamp_commit ffmpeg) $(get_timestamp_commit libass) +} + +case "$1" in + --master) + do_timestamp_commit_all + ;; + --release|'') + do_version_all + ;; + *) + echo >&2 "$0 --master" + echo >&2 "$0 --release" + exit 0 + ;; +esac + diff --git a/update b/update index 7a7ee9e..ef9d171 100755 --- a/update +++ b/update @@ -75,6 +75,11 @@ do_bootstrap() scripts/mpv-bootstrap } +do_update_debian_versions() +{ + scripts/debian-update-versions $1 +} + if [ x"$1" != x"--skip-selfupdate" ]; then ( set -ex @@ -98,4 +103,6 @@ case "$1" in ;; esac +do_update_debian_versions $1 + do_bootstrap -- cgit v1.2.3 From 9f3315a9f3fb7ca8b3a91fd4d0debe308ea81d5b Mon Sep 17 00:00:00 2001 From: Kevin Mitchell Date: Wed, 5 Feb 2014 20:08:46 -0800 Subject: recommend video acceleration libraries --- debian/control | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index f30dc9b..85aca21 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Standards-Version: 3.9.3 Build-Depends: autoconf, automake, - c-compiler, + c-compiler | gcc, debhelper (>= 7), gcc-4.8 [powerpc powerpcspe sparc], ladspa-sdk, @@ -55,7 +55,10 @@ Build-Depends: Package: mpv Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: libgl1-mesa-dri +Recommends: + libgl1-mesa-dri, + i965-va-driver | xvba-va-driver | libva-intel-vaapi-driver | va-driver, + nvidia-vdpau-driver | nvidia-driver-binary | nvidia-current | vdpau-driver Suggests: libaacs0 Description: mplayer/mplayer2 based video player MPV is a versatile CLI movie player, based on mplayer and mplayer2. -- cgit v1.2.3