[SCM] mplayer/ubuntu: syncronize with debian
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Feb 26 13:19:22 UTC 2011
The following commit has been merged in the ubuntu branch:
commit 50101dae789cf32289b59e8a97ec619d558a8704
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat Feb 26 13:58:20 2011 +0100
syncronize with debian
mostly cruft
diff --git a/debian/README.Debian b/debian/README.Debian
index b888afa..68d6cf2 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -28,10 +28,7 @@ This issue is pointed out in detail in the following thread:
http://lists.debian.org/debian-legal/2003/debian-legal-200301/msg00231.html
Currently mplayer ships files such as
- liba52/liba52_changes.diff
libfaad2/local_changes.diff
- libmpdvdkit2/libdvdcss_changes.diff
- libmpdvdkit2/libdvdread_changes.diff
libmpeg2/libmpeg-0.4.0.diff
tremor/tremor.diff
to comply with this request.
diff --git a/debian/README.source b/debian/README.source
index 2c8880a..7ca5ebc 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,21 +1,6 @@
-This package uses quilt to manage all modifications to the upstream source.
-If you want to know more about how to use quilt to manage Debian patches, read
-/usr/share/doc/quilt/README.source.
+The sources of this mplayer package have some parts removed!
-Only if you are building from the packaging gut branch, then the package
-expects you to have the quilt package installed. For this reason, quilt
-is not an explicit build dependency.
-
-NB: The sources of this mplayer package have some parts removed!
-
-* In order to update the package yourself and/or to review the changes done
- to the source code, please see the files:
-
- debian/README.upstream-upgrade
- debian/get-orig-source.sh
- debian/strip.sh
-
-* In particular, the internal mpdvdkit library was deleted, so the mplayer
+* In particular, the internal libdvdcss library was deleted, so the mplayer
package provided by Debian is unable to play encrypted DVDs. If you want to
play encrypted DVDs (i.e. almost all available Video-DVDs), please follow
the instructions in /usr/share/doc/libdvdread3/README.Debian on how to
@@ -23,4 +8,4 @@ NB: The sources of this mplayer package have some parts removed!
A. Mennucc with adaptions by Reinhard Tartler and Fabian Greffrath
- -- Reinhard Tartler <siretart at tauware.de>, Thu, 3 Jun 2010 18:25:09 +0200
+ -- Reinhard Tartler <siretart at tauware.de>, Sun, 13 Feb 2011 09:55:32 +0100
diff --git a/debian/README.upstream-upgrade b/debian/README.upstream-upgrade
deleted file mode 100644
index 65f2166..0000000
--- a/debian/README.upstream-upgrade
+++ /dev/null
@@ -1,44 +0,0 @@
-Checklist and howto for mplayer upstream upgrades:
-
-Needed packages:
-
- apt-get install devscripts git-buildpackage pristine-tar
-
-Stage in a tmp directory:
-
- mkdir /tmp/m ; cd /tmp/m
- git clone git://git.debian.org/git/pkg-multimedia/mplayer.git
- cd mplayer
- branches="master.unstripped pristine-tar upstream upstream.unstripped"
- for b in $branches; do git checkout -b $b origin/$b ; done
-
-Prepare the environment:
-
- SVNDATE=`date +%Y%m%d`
- git checkout master
-
-Fetch and commit the new upstream version:
-
- debian/rules get-orig-source SVN_VERSION=${SVNDATE}
- git-import-orig \
- --debian-branch=master \
- --upstream-branch=upstream \
- --pristine-tar \
- --no-dch \
- --upstream-version=1.0~rc3+svn${SVNDATE} \
- --upstream-tag=upstream/1.0rc3+svn${SVNDATE} \
- ../mplayer_1.0~rc3+svn${SVNDATE}.orig.tar.gz
-
- git checkout master.unstripped
- git-import-orig \
- --debian-branch=master.unstripped \
- --upstream-branch=upstream.unstripped \
- --pristine-tar \
- --no-dch \
- --upstream-tag=upstream.unstripped/1.0rc3+svn${SVNDATE}-unstripped \
- --upstream-version=1.0~rc3+svn${SVNDATE}-unstripped \
- ../mplayer-non-dfsg_1.0~rc3+svn${SVNDATE}.orig.tar.gz
-
- git checkout master
-
-more comments will follow..
diff --git a/debian/control b/debian/control
index d7261c5..a1edd0a 100644
--- a/debian/control
+++ b/debian/control
@@ -73,35 +73,6 @@ Build-Depends: debhelper (>= 7),
xsltproc,
zlib1g-dev
-Package: mplayer-gui
-Architecture: any
-Suggests: mplayer-doc,
- ttf-freefont,
- bzip2,
- fontconfig
-Depends: mplayer-skin,
- mplayer,
- ${shlibs:Depends},
- ${misc:Depends}
-Replaces: mplayer-doc (<< 2:1.0~rc3+svn20090426-2),
- mplayer (<< 2:1.0~rc3+svn20090426-2)
-Description: movie player for Unix-like systems
- MPlayer plays most MPEG, VOB, AVI, Ogg/OGM, VIVO,
- ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA files,
- supported by many native, XAnim, RealPlayer, and Win32 DLL codecs. It can
- also play VideoCD, SVCD, DVD, 3ivx, RealMedia, and DivX movies.
- .
- Another big feature of MPlayer is the wide range of supported output
- drivers. It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev,
- DirectFB, but also SDL (plus all its drivers) and some
- low level card-specific drivers (for Matrox, 3Dfx and Radeon, Mach64
- and Permedia3). Most of them support software or hardware scaling,
- therefore allowing fullscreen display. MPlayer is also able
- to use some hardware MPEG decoder boards, such as the DVB
- and DXR3/Hollywood+.
- .
- This package includes the gui variant of mplayer.
-
Package: mencoder
Architecture: any
Suggests: mplayer-doc,
diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
deleted file mode 100644
index bb30f72..0000000
--- a/debian/get-orig-source.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/sh
-#
-# Script to create a 'pristine' tarball for the debian mplayer source package
-# Copyright (C) 2009, Reinhard Tartler
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-set -eu
-
-usage() {
- cat >&2 <<EOF
-usage: $0 [-dh]
- -h : display help
- -d : svn date
-EOF
-}
-
-debug () {
- $DEBUG && echo "DEBUG: $*" >&2
-}
-
-error () {
- echo "$1" >&2
- exit 1;
-}
-
-set +e
-PARAMS=`getopt hd: "$@"`
-if test $? -ne 0; then usage; exit 1; fi;
-set -e
-
-eval set -- "$PARAMS"
-
-DEBUG=false
-SVNDATE=
-
-while test $# -gt 0
-do
- case $1 in
- -h) usage; exit 1 ;;
- -d) SVNDATE=$2; shift ;;
- --) shift ; break ;;
- *) echo "Internal error!" ; exit 1 ;;
- esac
- shift
-done
-
-# sanity checks now
-dh_testdir
-
-if [ -z $SVNDATE ]; then
- error "you need to specify an svn date. e.g. 20081230 for Dec 29. 2008"
-fi
-
-CLEANUPSCRIPT=`pwd`/debian/strip.sh
-TARBALL=`pwd`/../mplayer_1.0~rc3+svn${SVNDATE}.orig.tar.gz
-TARBALL_UNSTRIPPED=`pwd`/../mplayer-non-dfsg_1.0~rc3+svn${SVNDATE}.orig.tar.gz
-PACKAGENAME=mplayer
-
-TMPDIR=`mktemp -d`
-trap 'rm -rf ${TMPDIR}' EXIT
-
-baseurl="svn://svn.mplayerhq.hu/mplayer/branches/1.0rc3"
-
-svn export -r{${SVNDATE}} \
- --ignore-externals \
- ${baseurl} \
- ${TMPDIR}/${PACKAGENAME}
-
-svn info -r{${SVNDATE}} \
- ${baseurl} \
- | awk '/^Revision/ {print $2}' \
- > ${TMPDIR}/${PACKAGENAME}/.svnrevision
-
-# get svn externals
-svn pg svn:externals $baseurl | grep -v libswscale | \
-while read external url; do
- [ -z $url ] && continue
- dest="${TMPDIR}/${PACKAGENAME}/${external}"
- svn export -r{${SVNDATE}} --ignore-externals $url $dest
- svn info $url -r{${SVNDATE}} \
- | awk '/^Revision/ {print $2}' > ${dest}/.svnrevision
-done
-
-# for mplayer release branches, libswscale is special since it contains
-# svn revision options. The revision below needs manual syncing with
-# upstream's svn.
-
-# TODO: find some way to integrate this in the while loop above
-
-dest="${TMPDIR}/${PACKAGENAME}/libswscale"
-revision=28777
-svn export -r $revision svn://svn.ffmpeg.org/mplayer/trunk/libswscale $dest
-echo $revision > ${dest}/.svnrevision
-
-# this doesn't belong in strip.sh, because the unstripped source should
-# have this directory renamed as well.
-( cd ${TMPDIR}/${PACKAGENAME} && rm -rfv debian )
-
-( cd ${TMPDIR}/ && mv ${PACKAGENAME} ${PACKAGENAME}-${SVNDATE} )
-
-tar czf ${TARBALL_UNSTRIPPED} -C ${TMPDIR} ${PACKAGENAME}-${SVNDATE}
-
-( cd ${TMPDIR}/${PACKAGENAME}-${SVNDATE} && sh ${CLEANUPSCRIPT} )
-
-tar czf ${TARBALL} -C ${TMPDIR} ${PACKAGENAME}-${SVNDATE}
-
-# print diff
-( cd ${TMPDIR} && ptardiff ${TARBALL_UNSTRIPPED} ) | tee ${TARBALL}.diff
diff --git a/debian/patches/60eval-api.patch b/debian/patches/60eval-api.patch
deleted file mode 100644
index 9f1ba9f..0000000
--- a/debian/patches/60eval-api.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From: Reinhard Tartler <siretart at tauware.de>
-Subject: Revert commits r31322, 31299 and 31187 by cehoyos
-
---- a/libmpcodecs/vf_geq.c
-+++ b/libmpcodecs/vf_geq.c
-@@ -34,7 +34,7 @@
- #include "vf.h"
-
- #include "libavcodec/avcodec.h"
--#include "libavutil/eval.h"
-+#include "libavcodec/eval.h"
-
- struct vf_priv_s {
- AVExpr * e[3];
-@@ -116,7 +116,7 @@ static int put_image(struct vf_instance
- const_values[3]=y;
- for(x=0; x<w; x++){
- const_values[2]=x;
-- dst[x + y * dst_stride] = av_eval_expr(vf->priv->e[plane],
-+ dst[x + y * dst_stride] = ff_eval_expr(vf->priv->e[plane],
- const_values, vf);
- }
- }
-@@ -137,7 +137,7 @@ static void uninit(struct vf_instance *v
- //===========================================================================//
- static int vf_open(vf_instance_t *vf, char *args){
- char eq[3][2000] = { { 0 }, { 0 }, { 0 } };
-- int plane, res;
-+ int plane;
-
- vf->config=config;
- vf->put_image=put_image;
-@@ -178,11 +178,11 @@ static int vf_open(vf_instance_t *vf, ch
- plane==0 ? lum : (plane==1 ? cb : cr),
- NULL
- };
-- res = av_parse_expr(&vf->priv->e[plane], eq[plane], const_names, NULL, NULL, func2_names, func2, 0, NULL);
-+ char * a;
-+ vf->priv->e[plane] = ff_parse_expr(eq[plane], const_names, NULL, NULL, func2, func2_names, &a);
-
-- if (res < 0) {
-- mp_msg(MSGT_VFILTER, MSGL_ERR, "geq: error loading equation `%s'\n", eq[plane]);
-- return 0;
-+ if (!vf->priv->e[plane]) {
-+ mp_msg(MSGT_VFILTER, MSGL_ERR, "geq: error loading equation `%s': %s\n", eq[plane], a);
- }
- }
-
---- a/libmpcodecs/vf_qp.c
-+++ b/libmpcodecs/vf_qp.c
-@@ -32,7 +32,7 @@
- #include "libvo/fastmemcpy.h"
-
- #include "libavcodec/avcodec.h"
--#include "libavutil/eval.h"
-+#include "libavcodec/eval.h"
-
-
- struct vf_priv_s {
-@@ -66,16 +66,11 @@ static int config(struct vf_instance *vf
- "qp",
- NULL
- };
-- double temp_val;
-- int res;
-
-- res= av_parse_and_eval_expr(&temp_val, vf->priv->eq, const_names, const_values, NULL, NULL, NULL, NULL, NULL, 0, NULL);
--
-- if (res < 0){
-- mp_msg(MSGT_VFILTER, MSGL_ERR, "qp: Error evaluating \"%s\" \n", vf->priv->eq);
-- return 0;
-- }
-- vf->priv->lut[i+129]= lrintf(temp_val);
-+ const char *error = NULL;
-+ vf->priv->lut[i+129]= lrintf(ff_parse_and_eval_expr(vf->priv->eq, const_values, const_names, NULL, NULL, NULL, NULL, NULL, &error));
-+ if (error)
-+ mp_msg(MSGT_VFILTER, MSGL_ERR, "qp: Error evaluating \"%s\": %s\n", vf->priv->eq, error);
- }
-
- return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
diff --git a/debian/strip.sh b/debian/strip.sh
deleted file mode 100644
index d0af3cb..0000000
--- a/debian/strip.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-# This contains the dreaded DVD decryption code. We can live without it
-# by using libdvdread3 (and the optional library installed by
-# http://www.debian-unofficial.org/ :-)
-rm -rfv libdvdcss
-
-# play the most safe game at this point, remove mencoder.c from the
-# orig.tar.gz (again)
-rm -rfv mencoder.c
-
-# strip/clean the code from potentially dangerous patented code
-# KEEP THIS IN SYNC WITH THE ffmpeg-debian PACKAGE!
-for codec in 'h263.*' 'h264.*' mpeg2video mpeg4 'msmpeg4.*'; do
- F=libavcodec/allcodecs.c
- sed -i "/REGISTER_ENCODER.*\\<$codec\\>/d" $F
- sed -i "s/REGISTER_ENCDEC\\(.*\\<$codec\\>\\)/REGISTER_DECODER\\1/" $F
- F=libavcodec/*.c
- sed -i "/AVCodec *${codec}_encoder *=/,/^[[:space:]]*}/d" $F
-done
--
mplayer packaging
More information about the pkg-multimedia-commits
mailing list