diffstat of debian/ for xvidcore_1.3.2-2 xvidcore_1.2.2-0.1 README.source | 2 changelog | 407 +++++++++++++++++++++++++++++---------------- control | 51 +---- copyright | 106 ----------- gbp.conf | 3 install | 1 libxvidcore-dev.install | 2 libxvidcore-dev.links | 1 libxvidcore4-dev.files | 2 libxvidcore4-dev.install | 2 libxvidcore4.install | 1 libxvidcore4.links | 1 libxvidcore4.symbols | 12 - patches/01_exec-stack.diff | 13 + patches/series | 1 rules | 98 +++++++++- source/format | 1 watch | 5 18 files changed, 405 insertions(+), 304 deletions(-) diff -Nru xvidcore-1.3.2/debian/README.source xvidcore-1.2.2/debian/README.source --- xvidcore-1.3.2/debian/README.source 1970-01-01 00:00:00.000000000 +0000 +++ xvidcore-1.2.2/debian/README.source 2019-04-06 00:13:44.000000000 +0000 @@ -0,0 +1,2 @@ + +See /usr/share/doc/quilt/README.source diff -Nru xvidcore-1.3.2/debian/changelog xvidcore-1.2.2/debian/changelog --- xvidcore-1.3.2/debian/changelog 2011-07-26 09:02:43.000000000 +0000 +++ xvidcore-1.2.2/debian/changelog 2019-04-06 00:13:44.000000000 +0000 @@ -1,198 +1,325 @@ -xvidcore (2:1.3.2-2) unstable; urgency=low +xvidcore (2:1.2.2-0.1) unstable; urgency=low - * document copyright and license of altivec assembler + * debian/watch updated, should work now. + * Updated patch from Russell Coker to not demand an executable stack. - -- Reinhard Tartler Tue, 26 Jul 2011 11:02:05 +0200 + -- Christian Marillat Sun, 24 Jan 2010 13:21:34 +0100 -xvidcore (2:1.3.2-1) unstable; urgency=low +xvidcore (2:1.2.2-0.0) unstable; urgency=low - [ Fabian Greffrath ] - * Imported Upstream version 1.3.2 (Closes: #531040) - + dropped the debian/ directory from release tarballs. - + updated the configure helper scripts. - + Makefile does not include platform.inc in clean rules anymore. - + Makefile now shows build infos in the default build rule. + * New upstream release. + + -- Christian Marillat Fri, 29 May 2009 14:48:31 +0200 + +xvidcore (2:1.2.1-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Wed, 29 Apr 2009 14:49:06 +0200 + +xvidcore (2:1.1.3-0.6) unstable; urgency=low + + * Patch from Russell Coker to not demand an executable stack. + + -- Christian Marillat Mon, 12 Jan 2009 15:47:42 +0100 + +xvidcore (2:1.1.3-0.5) unstable; urgency=high + + * Do not rerun build/generic/bootstrap.sh but instead update config.sub + and config.guess otherwise the configure script doesn't find yasm for + amd64 arch. + * Patch configure (doesn't find nasm). + + -- Christian Marillat Sat, 03 May 2008 21:12:05 +0200 + +xvidcore (2:1.1.3-0.4) unstable; urgency=low + + * Move to quilt. + * Added Homepage field. + * Re-run build/generic/bootstrap.sh - [ Andres Mejia ] - * Update to my @debian.org email. - * Update debian/copyright to reflect licensing of new upstream release. - * Update debian/copyright to DEP-5 spec. + -- Christian Marillat Wed, 09 Apr 2008 17:18:45 +0200 - -- Andres Mejia Mon, 25 Jul 2011 21:07:23 -0400 +xvidcore (2:1.1.3-0.3) unstable; urgency=low -xvidcore (2:1.3.1-1) UNRELEASED; urgency=low + * Of course nasm is for i386 only. Last uplaod for today :) - [ Fabian Greffrath ] - * Imported Upstream version 1.3.1 - * Remove configure.in-fix.patch and no-exec-stack-elf32.patch, - applied upstream. - * Upstream updated their configure script, so drop autoconf. - * Update debian/gbp.conf and document filtering in git-import-orig. - * Fix so-symlink in debian/libxvidcore-dev.links. - * Simplify the changes to show build options during build. + -- Christian Marillat Wed, 05 Sep 2007 10:24:56 +0200 - [ Andres Mejia ] - * Show build options during build. - * Simplify setting of CFLAGS. - * Bump to Standards-Version 3.9.2. - * Fix description-synopsis-starts-with-article lintian warnings. - * Support parallel builds. - * Enable -O3 instead of -O2. - * Include Vcs-* entries. - * Add DM-Upload-Allowed: yes. - * Include local options to unapply all patches and abort on any upstream - changes. +xvidcore (2:1.1.3-0.2) unstable; urgency=low - -- Andres Mejia Tue, 03 May 2011 18:56:05 -0400 + * Add nasm in Build-Depends. -xvidcore (2:1.3.0-1) UNRELEASED; urgency=low + -- Christian Marillat Wed, 05 Sep 2007 10:20:48 +0200 - * Imported Upstream version 1.3.0 - * Use 3.0 (quilt) source format. - * Refresh build system patches. - * yasm (> 1.0) is required but not in Debian yet, - build-depend on nasm (>= 2.0) - * Avoid running configure in the clean rule. - * Remove unused lintian overrides. - * Fix ldconfig-symlink-referencing-wrong-file. - * Update libxvidcore4.symbols file. - * Drop build-system-update.patch, use autotools-dev and autoconf - at build-time instead. - * Backup and restore build/generic/configure instead of removing it. - * Really disable the executable bit for GNU-stack for elf32 archs. +xvidcore (2:1.1.3-0.1) unstable; urgency=high - -- Fabian Greffrath Fri, 25 Feb 2011 11:49:07 +0100 + * Add support for NCPUS and set urgency to high (CVE-2007-3329). -xvidcore (2:1.2.2+debian-3) UNRELEASED; urgency=low + -- Christian Marillat Wed, 05 Sep 2007 09:34:57 +0200 - [ Fabian Greffrath ] - * Update my e-mail address. - * Make use of dh --sourcedirectory, instead of overriding all of - dh_auto_*. - * Remove ltmain.sh from debian/patches/build-system-update.patch, - xvidcore does not even use libtool. - * Update debian/patches/build-system-update.patch with a recent - autoconf and autotools-dev. +xvidcore (2:1.1.3-0.0) unstable; urgency=low - [ Andres Mejia ] - * Fix issue where autoconf outputs badly formatted configure script. - * Update build-system-update.patch description with instructions on - how to update build system. - * Update Standards-Version to 3.9.1. No changes needed. + * New upstream release. + + -- Christian Marillat Wed, 05 Sep 2007 09:19:14 +0200 + +xvidcore (2:1.1.2-0.1) unstable; urgency=low + + * New patch to fix build on ia64. - -- Andres Mejia Sat, 11 Sep 2010 15:38:00 -0400 + -- Christian Marillat Thu, 2 Nov 2006 14:01:17 +0100 + +xvidcore (2:1.1.2-0.0) unstable; urgency=low + + * New upstream release. -xvidcore (2:1.2.2+debian-2) unstable; urgency=low + -- Christian Marillat Wed, 1 Nov 2006 16:27:54 +0100 - [ Maia Kozheva ] - * Merged README.Source and README.source. +xvidcore (2:1.1.0-final-0.1) unstable; urgency=low - [ Reinhard Tartler ] - * Upload to Debian, Closes: #531040 + * Patch to fix ia64 build. Thanks to Thibaut VARENE. - -- Reinhard Tartler Sat, 31 Jul 2010 21:52:24 -0400 + -- Christian Marillat Sun, 7 May 2006 13:08:28 +0200 -xvidcore (2:1.2.2+debian-1ubuntu2) maverick; urgency=low +xvidcore (2:1.1.0-final-0.0) unstable; urgency=low - * Really merge README.Source and README.source now. + * New upstream release. - -- Maia Kozheva Sat, 05 Jun 2010 18:02:44 +0700 + -- Christian Marillat Thu, 12 Jan 2006 09:20:35 +0100 -xvidcore (2:1.2.2+debian-1ubuntu1) maverick; urgency=low +xvidcore (2:1.1.0-beta2+cvs-0.0) unstable; urgency=low - * Merged from debian-unofficial release 2:1.2.2+debian-1, remaining - Ubuntu changes: - - Merged README.Source and README.source. + * Patch from CVS to fix build problem with amd64. + * Patch to not build with -freduce-all-givs - -- Maia Kozheva Sat, 05 Jun 2010 17:47:10 +0700 + -- Christian Marillat Thu, 22 Sep 2005 02:47:35 -0700 -xvidcore (2:1.2.2+debian-1) unstable; urgency=low +xvidcore (2:1.1.0-beta2-0.0) unstable; urgency=low - * Prepare release for Debian. - * Set appropriate debian-branch default for master branch. - * Fix Maintainer field and set myself as an uploader. - * Bump Standards-Version to 4. - * Remove dependence on cdbs and just use debhelper. - * Update the build system via a quilt patch. - * Add lintian overrides with appropriate messages for overrides. + * New upstream release - -- Andres Mejia Sat, 08 May 2010 01:37:15 -0400 + -- Christian Marillat Mon, 25 Apr 2005 12:43:51 +0200 -xvidcore (2:1.2.2+debian-0ubuntu2) lucid; urgency=low +xvidcore (2:1.1.0-beta1-0.1) unstable; urgency=low - * Non-exec patches got broken upstream by invoking yasm -f elf64/elf32, - so the __OUTPUT_FORMAT__==elf test no longer works. Instead, trigger - the section in the global include file, thanks to Russell Coker - (LP: #530876). + * From Guido, in debian/control : + o Type architectures must be seperated by space, not comma - -- Kees Cook Tue, 02 Mar 2010 11:20:39 -0800 + -- Christian Marillat Fri, 22 Apr 2005 15:15:18 +0200 -xvidcore (2:1.2.2+debian-0ubuntu1) lucid; urgency=low +xvidcore (2:1.1.0-beta1-0.0) unstable; urgency=low - * Fakesynced new upstream release from the debian-multimedia git repository. - (LP: #306399) - * Dropped Ubuntu patches, all applied upstream: - - 01_ia64_fix.dpatch - - 50_non-exec-stack.dpatch - - CVE-2007-3329.dpatch + * New upstream release - -- Maia Kozheva Fri, 20 Nov 2009 12:48:09 +0600 + -- Christian Marillat Sat, 26 Mar 2005 00:01:05 +0100 -xvidcore (1.2.2+debian-0debimedia1) unstable; urgency=low +xvidcore (2:1.0.3-0.0) unstable; urgency=low - * Added debian/README.Source. - * Updated Maintainer and Uploaders fields. - * Build-Depend on yasm (>= 0.8), since it's in squeeze now. - * Bumped Standards-Version to 3.8.2. + * New upstream release - -- Fabian Greffrath Wed, 12 Aug 2009 08:38:39 +0200 + -- Christian Marillat Sat, 25 Dec 2004 07:06:28 +0100 -xvidcore (1.2.2+debian-0fab5) unstable; urgency=low +xvidcore (2:1.0.2-0.1) unstable; urgency=low - * debian/copyright: Finalized. + * The lib package Provides libxvidcore and the -dev package libxvidcore-dev - -- Fabian Greffrath Fri, 26 Jun 2009 09:00:00 +0200 + -- Christian Marillat Wed, 24 Nov 2004 17:52:37 +0100 -xvidcore (1.2.2+debian-0fab4) unstable; urgency=low +xvidcore (2:1.0.2-0.0) unstable; urgency=low - * debian/control: Prefer yasm (>= 0.8) over nasm (>= 2.0). - * debian/copyright: Simplified. + * New upstream release. - -- Fabian Greffrath Thu, 25 Jun 2009 11:00:00 +0200 + -- Christian Marillat Sun, 5 Sep 2004 10:38:57 +0200 -xvidcore (1.2.2+debian-0fab3) unstable; urgency=low +xvidcore (2:1.0.1-0.0) unstable; urgency=low - * debian/control, debian/rules: Ported from debhelper (>= 7.2) to cdbs. - * debian/control: Wrapped Build-Depends and Depends fields. - * debian/control: Removed Build-Depends on quilt. - * debian/patches/: Removed. + * New upstream release. - -- Fabian Greffrath Wed, 24 Jun 2009 16:30:00 +0200 + -- Christian Marillat Tue, 8 Jun 2004 09:37:08 +0200 -xvidcore (1.2.2+debian-0fab2) unstable; urgency=low +xvidcore (2:1.0.0-0.0) unstable; urgency=low - * debian/control: Bumped Build-Depends to debhelper (>= 7.2). - * debian/control: Adjusted Build-Depends on nasm and yasm. - * debian/copyright: Improved based on an approach by - Loïc Martin . - * debian/libxvidcore4.symbols: Added. - * debian/rules: Added reasonable defaults to CFLAGS. - * debian/rules: Added execute permissions to the configure script - after the patch rule instead of before the configure rule. - * debian/watch: Added. + * New upstream release. - -- Fabian Greffrath Wed, 24 Jun 2009 15:00:00 +0200 + -- Christian Marillat Tue, 18 May 2004 14:56:43 +0200 -xvidcore (1.2.2+debian-0fab1) unstable; urgency=low +xvidcore (1:1.0.0-rc4-0.0) unstable; urgency=low * New upstream release. - -- Fabian Greffrath Tue, 02 Jun 2009 00:00:00 +0200 + -- Christian Marillat Tue, 6 Apr 2004 15:25:57 +0200 + +xvidcore (1:1.0.0-rc2-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 8 Feb 2004 22:49:17 +0100 + +xvidcore (1:1.0.0-rc1-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sat, 7 Feb 2004 16:39:26 +0100 + +xvidcore (1:1.0.0-beta3-0.0) unstable; urgency=low + + * News Beta release. + + -- Christian Marillat Sun, 28 Dec 2003 14:43:28 +0100 + +xvidcore (1:1.0.0-beta2-0.0) unstable; urgency=low + + * News Beta release. + + -- Christian Marillat Sat, 20 Dec 2003 23:32:59 +0100 + +xvidcore (1:0.9.2-0.3) unstable; urgency=low + + * Add a versioned shlibs and remove generated libxvidcore.def + + -- Christian Marillat Fri, 22 Aug 2003 00:53:38 +0200 + +xvidcore (1:0.9.2-0.2) unstable; urgency=low + + * Forgot to change the internal library name. + + -- Christian Marillat Fri, 22 Aug 2003 00:53:34 +0200 + +xvidcore (1:0.9.2-0.1) unstable; urgency=low + + * debian/control libxvidcore-dev should depends on libxvidcore2 not libxvidencore2 + + -- Christian Marillat Thu, 21 Aug 2003 22:58:11 +0200 + +xvidcore (1:0.9.2-0.0) unstable; urgency=low + + * New upstream release. + * Install example files in the -doc packages. + * Change package name to libxvidcore2, libxvidcore-dev and libxvidcore-doc + + -- Christian Marillat Thu, 21 Aug 2003 22:43:12 +0200 + +xvidcore (1:0.9.1-0.2) unstable; urgency=low + + * Some package re-arrangement before packaging 0.9.2 + + -- Christian Marillat Wed, 20 Aug 2003 15:23:24 +0200 + +xvidcore (1:0.9.1-0.1) unstable; urgency=low + + * Change section for -doc package. + * Include portab.h + + -- Christian Marillat Fri, 11 Jul 2003 10:25:24 +0200 + +xvidcore (1:0.9.1-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sat, 15 Feb 2003 17:33:56 +0100 + +xvidcore (1:0.9.0-0.4) unstable; urgency=low + + * debian/control Change Architecture to any + + -- Christian Marillat Tue, 11 Feb 2003 01:01:20 +0100 + +xvidcore (1:0.9.0-0.3) unstable; urgency=low + + * Add sparc build and fix ia64 + + -- Christian Marillat Tue, 11 Feb 2003 00:34:20 +0100 + +xvidcore (1:0.9.0-0.2) unstable; urgency=low + + * Use the right Makefile for ppc and ia64. + + -- Christian Marillat Tue, 21 Jan 2003 21:44:55 +0100 + +xvidcore (1:0.9.0-0.1) unstable; urgency=low + + * Bump Standards-Version to 3.5.8 + * Add a new -doc package. + * Remove gcc-3.2 build-dependency now gcc-3.2 is the default gcc + + -- Christian Marillat Tue, 7 Jan 2003 23:39:53 +0100 + +xvidcore (1:0.9.0-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Wed, 27 Nov 2002 01:05:39 +0100 + +xvid (20020822-0.0) unstable; urgency=low + + * New cvs snapshot. + * Build with gcc-3.2 + + -- Christian Marillat Mon, 23 Sep 2002 15:48:08 +0200 + +xvid (20020728-0.0) unstable; urgency=low + + * New cvs snapshot. + * Add DEB_BUILD_OPTIONS support + + -- Christian Marillat Wed, 14 Aug 2002 18:21:31 +0200 + +xvid (20020412-2) unstable; urgency=low + + * Add divx4.h in the package. + + -- Christian Marillat Tue, 6 Aug 2002 15:34:00 +0200 + +xvid (20020412-1) unstable; urgency=low + + * New cvs snapshot. + + -- Christian Marillat Fri, 12 Apr 2002 11:49:15 +0200 + +xvid (20020404-1) unstable; urgency=low + + * New cvs snapshot. + + -- Christian Marillat Sun, 7 Apr 2002 15:13:18 +0200 + +xvid (20020317-1) unstable; urgency=low + + * New cvs snapshot. + + -- Christian Marillat Wed, 27 Mar 2002 15:07:57 +0100 + +xvid (20020121-2) unstable; urgency=low + + * Include the header file. + * Don't compile for pentium-pro + + -- Christian Marillat Mon, 4 Mar 2002 18:39:53 +0100 + +xvid (20020121-1) unstable; urgency=low + + * New cvs snapshot. + + -- Christian Marillat Mon, 11 Feb 2002 18:52:55 +0100 + +xvid (20020120-1) unstable; urgency=low + + * New cvs snapshot. + + -- Christian Marillat Mon, 21 Jan 2002 19:15:41 +0100 + +xvid (20020105-1) unstable; urgency=low + + * New cvs snapshot. + + -- Christian Marillat Sat, 12 Jan 2002 15:29:23 +0100 + +xvid (20011128-1) unstable; urgency=low -xvidcore (1.2.1+debian-0fab1) unstable; urgency=low + * Initial Release. - * Initial release. - * Rebuilt upstream tarball without debian/ directory. - * Patched a build environment into the top level source directory. + -- Christian Marillat Fri, 30 Nov 2001 16:42:45 +0100 - -- Fabian Greffrath Mon, 01 Jun 2009 00:00:00 +0200 +Local variables: +mode: debian-changelog +End: diff -Nru xvidcore-1.3.2/debian/control xvidcore-1.2.2/debian/control --- xvidcore-1.3.2/debian/control 2011-07-26 09:00:31.000000000 +0000 +++ xvidcore-1.2.2/debian/control 2019-04-06 00:13:44.000000000 +0000 @@ -1,44 +1,25 @@ Source: xvidcore Section: libs Priority: optional -Maintainer: Debian Multimedia Maintainers -Uploaders: Loïc Martin , - Reinhard Tartler , - Fabian Greffrath , - Andres Mejia -Build-Depends: debhelper (>= 7.3~), - yasm (>= 1.0) [i386 amd64] -Standards-Version: 3.9.2 -DM-Upload-Allowed: yes +Maintainer: Christian Marillat +Bugs: mailto:marillat@debian.org Homepage: http://www.xvid.org/ -Vcs-Git: git://anonscm.debian.org/pkg-multimedia/xvidcore.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/xvidcore.git +Standards-Version: 3.8.3 +Build-Depends: debhelper (>> 7), quilt, yasm (>= 0.8.0) [i386 amd64], autotools-dev Package: libxvidcore4 Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends} -Description: Open source MPEG-4 video codec (library) - Xvid (formerly XviD) is an open source MPEG-4 video codec, implementing MPEG-4 - Simple Profile, Advanced Simple Profile, and Advanced Video Coding standards. - It is written in C with assembler optimizations for quality and speed - (including MMX, SSE, and 3Dnow! code for i386 and AltiVec for PowerPC), and is - especially optimized towards offline, multi-pass compression for storage and - archival purposes. - . - This package contains the shared library. +Depends: ${shlibs:Depends}, ${misc:Depends} +Provides: libxvidcore +Description: High quality ISO MPEG4 codec library + XviD is a high quality/performance ISO MPEG4 codec. -Package: libxvidcore-dev -Section: libdevel +Package: libxvidcore4-dev Architecture: any -Depends: libxvidcore4 (= ${binary:Version}), - ${misc:Depends} -Description: Open source MPEG-4 video codec (development) - Xvid (formerly XviD) is an open source MPEG-4 video codec, implementing MPEG-4 - Simple Profile, Advanced Simple Profile, and Advanced Video Coding standards. - It is written in C with assembler optimizations for quality and speed - (including MMX, SSE, and 3Dnow! code for i386 and AltiVec for PowerPC), and is - especially optimized towards offline, multi-pass compression for storage and - archival purposes. - . - This package contains the development files. +Depends: libxvidcore4 (= ${binary:Version}), ${misc:Depends} +Section: libdevel +Replaces: libxvidencore0 (<= 1:0.9.1-0.1) +Provides: libxvidcore-dev +Conflicts: libxvidencore-dev, libxvidcore-dev +Description: High quality ISO MPEG4 codec library -- development files + XviD is a high quality/performance ISO MPEG4 codec. diff -Nru xvidcore-1.3.2/debian/copyright xvidcore-1.2.2/debian/copyright --- xvidcore-1.3.2/debian/copyright 2011-07-26 09:00:31.000000000 +0000 +++ xvidcore-1.2.2/debian/copyright 2019-04-06 00:13:44.000000000 +0000 @@ -1,101 +1,13 @@ -Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174&view=markup -Upstream-Name: xvidcore -Upstream-Contact: xvid-devel@xvid.org -Source: http://www.xvid.org +This package was debianized by Christian Marillat on +Fri, 30 Nov 2001 16:42:45 +0100. -Files: * -Copyright: © 1999, Intel Corporation - © 2000-2001, Michel Lespinasse - © 2000, Royce Shih-Wea Liao - © 2000-2001, Peter Gubanov - © 2001, Fabrice Bellard - © 2001, Michael Niedermayer - © 2001-2003, xvid team - © 2001-2004, Peter Ross - © 2001-2011, Michael Militzer - © 2002, Alexander Viehl - © 2002, Benjamin Herrenschmidt - © 2002, Christian Engel - © 2002, Christian Schwarz - © 2002, Christopher Özbek - © 2002, Daniel Kallfass - © 2002, Daniel Smith - © 2002, Daniel Winkler - © 2002, Dirk Knop - © 2002, Dmitry Rozhdestvensky - © 2002, Haiko Gaisser - © 2002, Hannes Jütting - © 2002, Hans-Joachim Daniels - © 2002, Ingo-Marc Weber - © 2002, Johannes Singler - © 2002, Kai Kühn - © 2002, Max Stengel - © 2002, MinChen - © 2002, Sebastian Felis - © 2002, Sebastian Hack - © 2002, Stephan Krause - © 2002-2003, Christoph Lampert - © 2002-2003, Jaan Kalda - © 2002-2004, Benjamin Lambert - © 2002-2004, Edouard Gomez - © 2002-2005, Radoslaw Czyz - © 2002-2006, Pascal Massimino - © 2004, Dcoder - © 2004, Jean-Marc Bastide - © 2004, Marc Fauconneau - © 2004, Christoph Naegeli - © 2004-2005, Christoph Naegeli - © 2005, Carlo Bramini - © 2005-2006, Johannes Reinhardt - © 2006-2011, Xvid Solutions GmbH - © 2008, Jason Garrett-Glaser - © Johannes Singler -License: GPL-2+ +It was downloaded from http://www.videocoding.de/index.php?section=Download -Files: debian/* -Copyright: © 2001, Christian Marillat - © 2003, Edouard Gomez - © 2005-2009, Fabian Greffrath - © 2009, Loïc Martin - © 2009-2011, Reinhard Tartler , - © 2009-2011, Andres Mejia -License: GPL-2+ +Upstream Author: peter ross -Files: src/dct/ppc_asm/* -Copyright: © 2001, Michel Lespinasse - © 2004, Christoph Naegeli -License: LGPL-2+ +Copyright: (c)2001 peter ross -License: GPL-2+ - This package 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 package 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, see . - . - On Debian systems, the complete text of the GNU General Public License - can be found at '/usr/share/common-licenses/GPL-2'. - -License: LGPL-2+ - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - . - This library 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 - Lesser General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see . - . - On Debian systems, the complete text of the GNU General Public License - can be found at '/usr/share/common-licenses/LPL-2'. + You should have received a copy of the GNU General Public License with the + Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL; if + not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth + Floor, Boston, MA 02110-1301, USA. diff -Nru xvidcore-1.3.2/debian/gbp.conf xvidcore-1.2.2/debian/gbp.conf --- xvidcore-1.3.2/debian/gbp.conf 2011-07-26 09:03:05.000000000 +0000 +++ xvidcore-1.2.2/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -[DEFAULT] -debian-branch = master -pristine-tar = True diff -Nru xvidcore-1.3.2/debian/install xvidcore-1.2.2/debian/install --- xvidcore-1.3.2/debian/install 1970-01-01 00:00:00.000000000 +0000 +++ xvidcore-1.2.2/debian/install 2019-04-06 00:13:44.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/libxvidcore.so.4.2 diff -Nru xvidcore-1.3.2/debian/libxvidcore-dev.install xvidcore-1.2.2/debian/libxvidcore-dev.install --- xvidcore-1.3.2/debian/libxvidcore-dev.install 2011-07-26 09:00:31.000000000 +0000 +++ xvidcore-1.2.2/debian/libxvidcore-dev.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/include -usr/lib/*.a diff -Nru xvidcore-1.3.2/debian/libxvidcore-dev.links xvidcore-1.2.2/debian/libxvidcore-dev.links --- xvidcore-1.3.2/debian/libxvidcore-dev.links 2011-07-26 09:00:31.000000000 +0000 +++ xvidcore-1.2.2/debian/libxvidcore-dev.links 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -/usr/lib/libxvidcore.so.4.3 /usr/lib/libxvidcore.so diff -Nru xvidcore-1.3.2/debian/libxvidcore4-dev.files xvidcore-1.2.2/debian/libxvidcore4-dev.files --- xvidcore-1.3.2/debian/libxvidcore4-dev.files 1970-01-01 00:00:00.000000000 +0000 +++ xvidcore-1.2.2/debian/libxvidcore4-dev.files 2019-04-06 00:13:44.000000000 +0000 @@ -0,0 +1,2 @@ +usr/include +usr/lib/libxvidcore.{a,so} diff -Nru xvidcore-1.3.2/debian/libxvidcore4-dev.install xvidcore-1.2.2/debian/libxvidcore4-dev.install --- xvidcore-1.3.2/debian/libxvidcore4-dev.install 1970-01-01 00:00:00.000000000 +0000 +++ xvidcore-1.2.2/debian/libxvidcore4-dev.install 2019-04-06 00:13:44.000000000 +0000 @@ -0,0 +1,2 @@ +usr/include/xvid.h +usr/lib/libxvidcore.a diff -Nru xvidcore-1.3.2/debian/libxvidcore4.install xvidcore-1.2.2/debian/libxvidcore4.install --- xvidcore-1.3.2/debian/libxvidcore4.install 2011-07-26 09:00:31.000000000 +0000 +++ xvidcore-1.2.2/debian/libxvidcore4.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*.so.* diff -Nru xvidcore-1.3.2/debian/libxvidcore4.links xvidcore-1.2.2/debian/libxvidcore4.links --- xvidcore-1.3.2/debian/libxvidcore4.links 2011-07-26 09:00:31.000000000 +0000 +++ xvidcore-1.2.2/debian/libxvidcore4.links 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -/usr/lib/libxvidcore.so.4.3 /usr/lib/libxvidcore.so.4 diff -Nru xvidcore-1.3.2/debian/libxvidcore4.symbols xvidcore-1.2.2/debian/libxvidcore4.symbols --- xvidcore-1.3.2/debian/libxvidcore4.symbols 2011-07-26 09:00:31.000000000 +0000 +++ xvidcore-1.2.2/debian/libxvidcore4.symbols 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -libxvidcore.so.4 libxvidcore4 #MINVER# - xvid_decore@Base 1.2.2 - xvid_encore@Base 1.2.2 - xvid_global@Base 1.2.2 - xvid_plugin_2pass1@Base 1.2.2 - xvid_plugin_2pass2@Base 1.2.2 - xvid_plugin_dump@Base 1.2.2 - xvid_plugin_lumimasking@Base 1.2.2 - xvid_plugin_psnr@Base 1.2.2 - xvid_plugin_psnrhvsm@Base 2:1.3.0 - xvid_plugin_single@Base 1.2.2 - xvid_plugin_ssim@Base 1.2.2 diff -Nru xvidcore-1.3.2/debian/patches/01_exec-stack.diff xvidcore-1.2.2/debian/patches/01_exec-stack.diff --- xvidcore-1.3.2/debian/patches/01_exec-stack.diff 1970-01-01 00:00:00.000000000 +0000 +++ xvidcore-1.2.2/debian/patches/01_exec-stack.diff 2019-04-06 00:13:44.000000000 +0000 @@ -0,0 +1,13 @@ +Index: xvidcore-1.2.2/src/nasm.inc +=================================================================== +--- xvidcore-1.2.2.orig/src/nasm.inc 2010-01-24 13:14:20.000000000 +0100 ++++ xvidcore-1.2.2/src/nasm.inc 2010-01-24 13:17:15.000000000 +0100 +@@ -23,6 +23,8 @@ + ; * + ; ***************************************************************************/ + ++section .note.GNU-stack noalloc noexec nowrite progbits ++ + %ifdef ARCH_IS_X86_64 + + BITS 64 diff -Nru xvidcore-1.3.2/debian/patches/series xvidcore-1.2.2/debian/patches/series --- xvidcore-1.3.2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ xvidcore-1.2.2/debian/patches/series 2019-04-06 00:13:44.000000000 +0000 @@ -0,0 +1 @@ +01_exec-stack.diff diff -Nru xvidcore-1.3.2/debian/rules xvidcore-1.2.2/debian/rules --- xvidcore-1.3.2/debian/rules 2011-07-26 09:00:31.000000000 +0000 +++ xvidcore-1.2.2/debian/rules 2019-04-06 00:13:44.000000000 +0000 @@ -1,11 +1,91 @@ #!/usr/bin/make -f -# Set CFLAGS from DEB_CFLAGS if defined, otherwise let xvidcore's build system -# set CFLAGS to use. -DEFAULT_CFLAGS = -Wall -O3 -fstrength-reduce -finline-functions -ffast-math \ - -fomit-frame-pointer -CFLAGS = $(or $(DEB_CFLAGS),$(DEFAULT_CFLAGS)) - -%: - dh $@ --sourcedirectory=build/generic \ - --parallel +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) + CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +else + CROSS= --build $(DEB_BUILD_GNU_TYPE) +endif + +NCPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) + +ifeq ($(NCPUS),-1) + NCPUS:=1 +endif + +ifeq ($(NCPUS),0) + NCPUS:=1 +endif + +configure: configure-stamp +configure-stamp: debian/stamp-patched + dh_testdir + + cp -f /usr/share/misc/config.sub build/generic/config.sub + cp -f /usr/share/misc/config.guess build/generic/config.guess + + cd build/generic && ./configure $(CROSS) --prefix=/usr CFLAGS="$(CFLAGS)" + + touch $@ + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + + cd build/generic && $(MAKE) -j $(NCPUS) + + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + touch build/generic/platform.inc + cd build/generic && $(MAKE) distclean + + debian/rules unpatch + + dh_clean build/generic/config.sub build/generic/config.guess + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs -A usr/lib usr/include + + $(MAKE) -C build/generic install prefix=$(CURDIR)/debian/tmp/usr + + dh_install --fail-missing + + dh_link -plibxvidcore4-dev usr/lib/libxvidcore.so.4.2 usr/lib/libxvidcore.so + dh_link -plibxvidcore4 usr/lib/libxvidcore.so.4.2 usr/lib/libxvidcore.so.4 + +# Build architecture-independent files here. +binary-indep: build install + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -a + dh_testroot -a + dh_installdocs -a AUTHORS + dh_installchangelogs -a + dh_link -a + dh_strip -a + dh_compress -a + dh_fixperms -a + dh_makeshlibs -a -V 'libxvidcore4 (>= 1:1.0.0-0.0)' + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure diff -Nru xvidcore-1.3.2/debian/source/format xvidcore-1.2.2/debian/source/format --- xvidcore-1.3.2/debian/source/format 2011-07-26 09:00:31.000000000 +0000 +++ xvidcore-1.2.2/debian/source/format 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -3.0 (quilt) diff -Nru xvidcore-1.3.2/debian/watch xvidcore-1.2.2/debian/watch --- xvidcore-1.3.2/debian/watch 2011-07-26 09:00:31.000000000 +0000 +++ xvidcore-1.2.2/debian/watch 2019-04-06 00:13:44.000000000 +0000 @@ -1,3 +1,4 @@ version=3 -http://www.xvid.org/downloads.html \ -http://downloads.xvid.org/downloads/xvidcore-([\d\.]*)\.tar\.gz + + +http://www.xvid.org/Downloads.43.0.html http://downloads.xvid.org/downloads/xvidcore-(.*)\.tar\.gz