[SCM] faac/master: Imported Debian patch 1.28+cvs20150510-1
fabian at users.alioth.debian.org
fabian at users.alioth.debian.org
Mon May 18 17:15:58 UTC 2015
Imported Upstream version 1.28+cvs20150510
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: dcc82bcbc341faf6180ab371cbf08268ff8fcdfb
X-Git-Newrev: ff073a4396c7c0cbc1546aa7c4f61fa8d3f2f835
The following commit has been merged in the master branch:
commit ff073a4396c7c0cbc1546aa7c4f61fa8d3f2f835
Merge: dcc82bcbc341faf6180ab371cbf08268ff8fcdfb 98d9a8cbc327840967a1682b4f20ef4b007a336a
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date: Mon May 11 14:46:31 2015 +0200
Imported Debian patch 1.28+cvs20150510-1
diff --combined debian/README.source
index 0000000,0000000..08fd4d6
new file mode 100755
--- /dev/null
+++ b/debian/README.source
@@@ -1,0 -1,0 +1,20 @@@
++#!/bin/bash
++# This is how the Debian source tarball was created:
++
++set -e
++
++PACKAGE=faac
++VERSION=1.28+
++CVSDATE=2015-05-10
++PKGDATE=`echo $CVSDATE | tr -d '-'`
++
++TMPDIR=`mktemp -d`
++
++pushd ${TMPDIR}
++cvs -d:pserver:anonymous at faac.cvs.sourceforge.net:/cvsroot/faac login
++cvs -z3 -d:pserver:anonymous at faac.cvs.sourceforge.net:/cvsroot/faac export -D ${CVSDATE} ${PACKAGE}
++mv ${PACKAGE} ${PACKAGE}-${VERSION}cvs${PKGDATE}
++tar cJfv ${PACKAGE}_${VERSION}cvs${PKGDATE}.orig.tar.xz ${PACKAGE}-${VERSION}cvs${PKGDATE}
++popd
++
++cp ${TMPDIR}/${PACKAGE}_${VERSION}cvs${PKGDATE}.orig.tar.xz ..
diff --combined debian/changelog
index 2a094de,0000000..f3c6ee1
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,113 -1,0 +1,132 @@@
++faac (1.28+cvs20150510-1) unstable; urgency=medium
++
++ * New upstream CVS snapshot.
++ * Add debian/README.source to document how the Debian source tarball was
++ created and force xz compression in debian/gbp.conf.
++ * Remove all patches that were either applied, solved differently or
++ disapproved upstream:
++ + autotools-compat.patch: Disapproved upstream.
++ + build-fix.patch: Does not apply anymore.
++ + symbol-visibility.patch: Does not apply anymore.
++ + format-security.patch: Applied upstream.
++ + exposed-API.patch: Applied upstream.
++ + external-libmp4v2.patch: Does not apply anymore.
++ + external-libmp4v2_r479.patch: Applied upstream.
++ + libfaac_drm.patch: Does not apply anymore.
++ * Apply patch from upstream bug tracker to fix compilation without libmp4v2.
++
++ -- Fabian Greffrath <fabian+debian at greffrath.com> Mon, 11 May 2015 14:46:31 +0200
++
+faac (1.28-7) unstable; urgency=medium
+
+ * Build the DRM version of the library as well as the normal version,
+ thanks Julian Cable for the idea and the patch!
+ * Remove Andres Mejia from Uploaders (Closes: #743523).
+ * Remove debian/source/local-options, they are default now.
+ * Fix most autotools warnings
+ * Bump "Standards-Version" to 3.9.6.
+ * Run "wrap-and-sort -asb".
+
+ -- Fabian Greffrath <fabian+debian at greffrath.com> Thu, 30 Apr 2015 18:14:49 +0200
+
+faac (1.28-6) unstable; urgency=low
+
+ * Add "XS-Autobuild: yes" to debian/control and clarify in debian/copyright
+ that this package can legitimately and technically be auto-built
+ (Closes: #729145).
+
+ -- Fabian Greffrath <fabian+debian at greffrath.com> Thu, 21 Nov 2013 10:03:07 +0100
+
+faac (1.28-5) unstable; urgency=low
+
+ [ Andres Mejia ]
+ * Disable mp4v2 support.
+ This only disables mp4v2 for the faac utility program. The faac
+ utility is GPL-2 but the mp4v2 library is MPL-1.1. The two licenses
+ are incompatible with each other.
+
+ [ Reinhard Tartler ]
+ * Revise debian/copyright
+ * Bump standards version (no changes needed)
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 22 Jun 2013 15:09:31 +0200
+
+faac (1.28-4) unstable; urgency=low
+
+ * Upload to Debian. (Closes: #665318)
+ * Change my contact info to use my @debian.org email.
+ * Bump to Standards-Version 3.9.3.
+ * Make dev package multiarch installable.
+ * Add Vcs-* entries.
+
+ -- Andres Mejia <amejia at debian.org> Thu, 22 Mar 2012 21:45:48 -0400
+
+faac (1.28-3) unstable; urgency=low
+
+ * Use updated external libmp4v2 if available.
+ * Port faac to the iTMF Generic and Tags API.
+ * Add Build-Depends: libmp4v2-dev (>= 1.9.1).
+
+ -- Fabian Greffrath <fabian+debian at greffrath.com> Mon, 20 Feb 2012 15:06:05 +0100
+
+faac (1.28-2) unstable; urgency=low
+
+ * Build faac against the public API exposed in <faac.h>
+ instead of the private API defined in "libfaac/frame.h".
+ * Simplify symbol-visibility.patch accordingly.
+
+ -- Fabian Greffrath <fabian+debian at greffrath.com> Tue, 07 Feb 2012 14:28:52 +0100
+
+faac (1.28-1) unstable; urgency=low
+
+ * Update my e-mail address in Uploaders field.
+ * Update debian/copyright.
+ * Ship upstream manpage instead if our own one.
+ * Fix dh invocation in debian/rules.
+ * Set appropriate symbol visibility attributes.
+ * Add debian/libfaac0.symbols file.
+ * Fix format string security error.
+ * Multi-Archify.
+ * TODO: Port to libmp4v2-r479 API.
+
+ -- Fabian Greffrath <fabian+debian at greffrath.com> Mon, 06 Feb 2012 14:57:15 +0100
+
+faac (1.28-0fab3) unstable; urgency=low
+
+ [ Andres Mejia ]
+ * Various fixes for getting faac working on current Debian sid.
+ * Include myself in Uploaders field.
+ * Clarify comment about build fixes in patch.
+ * Change this package section to non-free due to its conflicting
+ licensing terms.
+ * Don't include libtool file.
+
+ [ Maia Kozheva ]
+ * Add .gitignore.
+ * Remove explicit quilt dependency, migrate to 3.0 source format.
+ * Remove autoreconf.patch, using dh_autoreconf.
+ * debian/control:
+ - Reword binary package descriptions to remove initial articles.
+ - Bump Standards-Version to 3.9.2.
+ - Update maintainer field.
+ - Add myself to uploaders.
+ * debian/control, debian/rules:
+ - Remove quilt, add dh-autoreconf support.
+ * debian/faac.manpages, debian/manpages/faac.1:
+ - Add manpage from Ubuntu version 1.26-0.1ubuntu2, with manpage hyphen
+ issues corrected.
+
+ -- Maia Kozheva <sikon at ubuntu.com> Thu, 09 Jun 2011 11:24:43 +0700
+
+faac (1.28-0fab2) unstable; urgency=low
+
+ * debian/control, debian/rules: Ported from debhelper (>= 7) to cdbs.
+ * debian/control: Wrapped Build-Depends and Depends fields.
+
+ -- Fabian Greffrath <fabian at greffrath.com> Mon, 29 Jun 2009 12:00:00 +0200
+
+faac (1.28-0fab1) unstable; urgency=low
+
+ * Initial release.
+
+ -- Fabian Greffrath <fabian at greffrath.com> Mon, 01 Jun 2009 00:00:00 +0200
diff --combined debian/gbp.conf
index cec628c,0000000..8a9ec36
mode 100644,000000..100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,2 -1,0 +1,2 @@@
+[DEFAULT]
- pristine-tar = True
++compression = xz
diff --combined debian/patches/frontend-without-libmp4v2.diff
index 0000000,0000000..c1683fd
new file mode 100644
--- /dev/null
+++ b/debian/patches/frontend-without-libmp4v2.diff
@@@ -1,0 -1,0 +1,48 @@@
++Description: Fix compilation without libmp4v2
++Bug: https://sourceforge.net/p/faac/bugs/200/
++Author: Krzysztof Nikiel
++
++--- a/frontend/main.c
+++++ b/frontend/main.c
++@@ -409,7 +409,6 @@ int main(int argc, char *argv[])
++ unsigned int useMidSide = 1;
++ static unsigned int useTns = DEFAULT_TNS;
++ enum container_format container = NO_CONTAINER;
++- int optimizeFlag = 0;
++ enum stream_format stream = ADTS_STREAM;
++ int cutOff = -1;
++ int bitRate = 0;
++@@ -439,6 +438,7 @@ int main(int argc, char *argv[])
++ FILE *outfile = NULL;
++
++ #ifdef HAVE_LIBMP4V2
+++ int optimizeFlag = 0;
++ MP4FileHandle MP4hFile = MP4_INVALID_FILE_HANDLE;
++ MP4TrackId MP4track = 0;
++ unsigned int ntracks = 0, trackno = 0;
++@@ -448,11 +448,11 @@ int main(int argc, char *argv[])
++ *genre = NULL, *comment = NULL, *writer = NULL;
++ u_int8_t *art = NULL;
++ u_int64_t artSize = 0;
++- u_int64_t total_samples = 0;
++ u_int64_t encoded_samples = 0;
++ unsigned int delay_samples;
++ unsigned int frameSize;
++ #endif
+++ u_int64_t total_samples = 0;
++ char *faac_id_string;
++ char *faac_copyright_string;
++
++@@ -1078,12 +1078,10 @@ int main(int argc, char *argv[])
++ else
++ samplesRead = 0;
++
++-#ifdef HAVE_LIBMP4V2
++ if (total_samples + (samplesRead / infile->channels) > infile->samples)
++ samplesRead = (infile->samples - total_samples) * infile->channels;
++
++ total_samples += samplesRead / infile->channels;
++-#endif
++
++ /* call the actual encoding routine */
++ bytesWritten = faacEncEncode(hEncoder,
diff --combined debian/patches/series
index fe8da1d,0000000..4d484c8
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,0 +1,1 @@@
- autotools-compat.patch
- build-fix.patch
- symbol-visibility.patch
- format-security.patch
- exposed-API.patch
- external-libmp4v2.patch
- external-libmp4v2_r479.patch
- libfaac_drm.patch
++frontend-without-libmp4v2.diff
--
faac packaging
More information about the pkg-multimedia-commits
mailing list