diff -Nru avifile-0.7.48~20090503.ds/debian/changelog avifile-0.7.48~20090503.ds/debian/changelog --- avifile-0.7.48~20090503.ds/debian/changelog 2012-01-06 09:46:05.000000000 +0000 +++ avifile-0.7.48~20090503.ds/debian/changelog 2012-05-09 08:20:07.000000000 +0000 @@ -1,3 +1,27 @@ +avifile (1:0.7.48~20090503.ds-12) unstable; urgency=low + + * Add ftbfs-gcc4.7.patch to fix FTBFS by gcc-4.7 (Closes: #667107) + + -- Ying-Chun Liu (PaulLiu) Wed, 09 May 2012 16:19:34 +0800 + +avifile (1:0.7.48~20090503.ds-11) unstable; urgency=low + + * Add libxt-dev to Build-Depends. Fix FTBFS on kfreebsd (Closes: #670450) + + -- Ying-Chun Liu (PaulLiu) Tue, 01 May 2012 12:07:09 +0800 + +avifile (1:0.7.48~20090503.ds-10) unstable; urgency=low + + * Multi-Arch support + - Use debhelper 9 + - Move common files to libavifile-0.7-common + - Move toolkit to libavifile-0.7-bin + * Bump Standards-Version to 3.9.3: nothing needs to be changed + * Don't install vidix files. (Closes: #669516) + * debian/copyright: use machine-readable 1.0 format + + -- Ying-Chun Liu (PaulLiu) Tue, 24 Apr 2012 02:11:21 +0800 + avifile (1:0.7.48~20090503.ds-9.1) unstable; urgency=low * Non-maintainer upload. diff -Nru avifile-0.7.48~20090503.ds/debian/compat avifile-0.7.48~20090503.ds/debian/compat --- avifile-0.7.48~20090503.ds/debian/compat 2009-11-19 11:59:45.000000000 +0000 +++ avifile-0.7.48~20090503.ds/debian/compat 2012-04-22 18:55:49.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru avifile-0.7.48~20090503.ds/debian/control avifile-0.7.48~20090503.ds/debian/control --- avifile-0.7.48~20090503.ds/debian/control 2012-01-06 09:45:35.000000000 +0000 +++ avifile-0.7.48~20090503.ds/debian/control 2012-05-01 04:09:05.000000000 +0000 @@ -2,28 +2,37 @@ Section: libs Priority: optional Maintainer: Ying-Chun Liu (PaulLiu) -Standards-Version: 3.9.2 -Build-Depends: debhelper (>= 7.0.50~), - libsdl1.2-dev, - libjpeg-dev, - libvorbis-dev, - libogg-dev, - libxft-dev, - automake, - libtool, - netpbm, - liba52-dev, - libavformat-dev, - libxxf86dga-dev, - libxi-dev, - libxxf86vm-dev +Standards-Version: 3.9.3 +Build-Depends: automake, + debhelper (>= 9), + liba52-dev, + libavformat-dev, + libjpeg-dev, + libogg-dev, + libsdl1.2-dev, + libtool, + libvorbis-dev, + libxft-dev, + libxi-dev, + libxt-dev, + libxxf86dga-dev, + libxxf86vm-dev, + netpbm Homepage: http://avifile.sf.net Package: libavifile-0.7c2 Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends} -Breaks: avifile-mad-plugin (<< 1:0.7.48~20090503.ds-5), avifile-mjpeg-plugin (<< 1:0.7.48~20090503.ds-5), avifile-vorbis-plugin (<< 1:0.7.48~20090503.ds-5), avifile-win32-plugin (<< 1:0.7.48~20090503.ds-5), avifile-xvid-plugin (<< 1:0.7.48~20090503.ds-5), avifile-divx-plugin (<< 1:0.7.48~20090503.ds-5), avifile-player (<< 1:0.7.48~20090503.ds-5), avifile-utils (<< 1:0.7.48~20090503.ds-5) +Pre-Depends: ${misc:Pre-Depends} +Depends: libavifile-0.7-common, ${misc:Depends}, ${shlibs:Depends} +Breaks: avifile-divx-plugin (<< 1:0.7.48~20090503.ds-5), + avifile-mad-plugin (<< 1:0.7.48~20090503.ds-5), + avifile-mjpeg-plugin (<< 1:0.7.48~20090503.ds-5), + avifile-player (<< 1:0.7.48~20090503.ds-5), + avifile-utils (<< 1:0.7.48~20090503.ds-5), + avifile-vorbis-plugin (<< 1:0.7.48~20090503.ds-5), + avifile-win32-plugin (<< 1:0.7.48~20090503.ds-5), + avifile-xvid-plugin (<< 1:0.7.48~20090503.ds-5) +Multi-Arch: same Description: shared libraries for AVI read/writing Library that allows programs to read and write compressed AVI files (Indeo Video, DivX ;-), etc.) under GNU. @@ -36,9 +45,52 @@ Package: libavifile-0.7-dev Architecture: any Section: libdevel -Depends: libavifile-0.7c2 (= ${binary:Version}), - ${misc:Depends} -Breaks: avifile-mad-plugin (<< 1:0.7.48~20090503.ds-5), avifile-mjpeg-plugin (<< 1:0.7.48~20090503.ds-5), avifile-vorbis-plugin (<< 1:0.7.48~20090503.ds-5), avifile-win32-plugin (<< 1:0.7.48~20090503.ds-5), avifile-xvid-plugin (<< 1:0.7.48~20090503.ds-5), avifile-divx-plugin (<< 1:0.7.48~20090503.ds-5), avifile-player (<< 1:0.7.48~20090503.ds-5), avifile-utils (<< 1:0.7.48~20090503.ds-5) +Depends: libavifile-0.7c2 (= ${binary:Version}), ${misc:Depends} +Breaks: avifile-divx-plugin (<< 1:0.7.48~20090503.ds-5), + avifile-mad-plugin (<< 1:0.7.48~20090503.ds-5), + avifile-mjpeg-plugin (<< 1:0.7.48~20090503.ds-5), + avifile-player (<< 1:0.7.48~20090503.ds-5), + avifile-utils (<< 1:0.7.48~20090503.ds-5), + avifile-vorbis-plugin (<< 1:0.7.48~20090503.ds-5), + avifile-win32-plugin (<< 1:0.7.48~20090503.ds-5), + avifile-xvid-plugin (<< 1:0.7.48~20090503.ds-5), + libavifile-0.7c2 (<< 1:0.7.48~20090503.ds-10) +Replaces: libavifile-0.7c2 (<< 1:0.7.48~20090503.ds-10) Description: development header files for libavifile Contains the symlinks, headers and object files needed to compile and link programs which use aviplay library. + +Package: libavifile-0.7-bin +Architecture: any +Section: misc +Depends: libavifile-0.7-common, ${misc:Depends}, ${shlibs:Depends} +Replaces: libavifile-0.7c2 (<< 1:0.7.48~20090503.ds-10) +Conflicts: libavifile-0.7c2 (<< 1:0.7.48~20090503.ds-10) +Description: toolkit for libavifile + Library that allows programs to read and write compressed + AVI files (Indeo Video, DivX ;-), etc.) under GNU. + (De)Compression is performed with various audio/video plugins + (FFMpeg, Vorbis, Win32, ...). + Formats like mpeg, mov are partly supported. + For more info about usage of Win32, Lame and OpenDivX plugin + see README.debian. + . + This package contains the toolkit for libavifile. + +Package: libavifile-0.7-common +Architecture: all +Section: misc +Depends: ${misc:Depends} +Replaces: libavifile-0.7c2 (<< 1:0.7.48~20090503.ds-10) +Breaks: libavifile-0.7c2 (<< 1:0.7.48~20090503.ds-10) +Multi-Arch: foreign +Description: toolkit for libavifile + Library that allows programs to read and write compressed + AVI files (Indeo Video, DivX ;-), etc.) under GNU. + (De)Compression is performed with various audio/video plugins + (FFMpeg, Vorbis, Win32, ...). + Formats like mpeg, mov are partly supported. + For more info about usage of Win32, Lame and OpenDivX plugin + see README.debian. + . + This package contains the common files which libavifile needed. diff -Nru avifile-0.7.48~20090503.ds/debian/copyright avifile-0.7.48~20090503.ds/debian/copyright --- avifile-0.7.48~20090503.ds/debian/copyright 2009-11-19 11:59:45.000000000 +0000 +++ avifile-0.7.48~20090503.ds/debian/copyright 2012-05-01 04:09:05.000000000 +0000 @@ -1,53 +1,105 @@ -This package has been debianized by Zdenek Kabelac kabi@debian.org on -Wed, 25 Oct 2000 19:52:19 +0200 - -URL: http://sourceforge.net/projects/avifile -This is official home page for the Avifile - CVS is also located there - -Freely downloadable binary codecs. - -Copyright: - -avifile: (lib, player, samples, plugins, ...) - Copyright © Zdenek Kabelac (the only - active developer) - Copyright © Eugene Kuznetsov - Copyright © Alexander Rawass - Copyright © Heinrich Langos - Copyright © Hiroshi Yamashita +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: avifile +Upstream-Contact: Zdenek Kabelac +Source: http://sourceforge.net/projects/avifile + +Files: * +Copyright: Zdenek Kabelac + Eugene Kuznetsov + Alexander Rawass + Heinrich Langos + Hiroshi Yamashita +License: GPL-2+ + +Files: debian/* +Copyright: 2000 Zdenek Kabelac +License: GPL-2+ + +Files: plugins/libmad/libmad/* +Copyright: 2000-2001 Robert Leslie + 2000-2004 Underbit Technologies, Inc. +License: GPL-2+ +Comment: + The libmad bundled copy is unused, since the Debian package links against + the system library.) + +Files: plugins/libwin32/loader/* +Copyright: 1994-1997 Brooktree Corporation + 2001 On2 Technologies. +License: GPL-2+ +Comment: mostly taken from Wine project ( http://www.winehq.com ) +Files: plugins/libaudiodec/gsm* +Copyright: 1992 Jutta Degener and Carsten Bormann License: - - 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 St, Fifth Floor, Boston, MA - 02110-1301, USA. - -plugins/libmad/libmad: - © 2000-2001 Robert Leslie - © 2000-2004 Underbit Technologies, Inc. - - (The libmad bundled copy is unused, since the Debian package links against the system library.) - -plugins/libwin32/loader/ : mostly taken from Wine project ( http://www.winehq.com ) -plugins/libaudiodec/gsm* : XAnim sources, see plugins/libaudiodec/xa_gsm.c for precise copyright -plugins/libmpeg_audiodecoder/ : 'splay' MP3 player, by Jung woo-jae -plugins/libac3pass/ : emu10k1 CVS tree - Juha Yrjölä -plugins/libmp3lame*/ : lame developers -lib/aviread/asfinput.cpp : partially from ASFRecorder ( http://members.tripod.com/asfrecorder ) -plugins/libvorbis/ : based on work of mplayer team - especialy Felix 'Atmosfear' Buenemann - -License: - -GPLv2+ (see /usr/share/common-licenses/GPL) -and LGPL (see /usr/share/common-licenses/LGPL). + Any use of this software is permitted provided that this notice is not + removed and that neither the authors nor the Technische Universitaet Berlin + are deemed to have made any representations as to the suitability of this + software for any purpose nor are held responsible for any defects of + this software. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE. +Comment: XAnim sources, see plugins/libaudiodec/xa_gsm.c for precise copyright + +Files: plugins/libmpeg_audiodecoder/* +Copyright: 1997 Jung woo-jae +License: GPL-2+ +Comment: 'splay' MP3 player, by Jung woo-jae + +Files: plugins/libac3pass/* +Copyright: 2001 Juha Yrjölä +License: GPL-2+ +Comment: emu10k1 CVS tree - Juha Yrjölä + +Files: plugins/libmp3lame*/ +Copyright: 1999 Mark Taylor + 2000 Don Melton +License: GPL-2+ +Comment: lame developers + +Files: lib/aviread/asfinput.cpp +Copyright: Rogue Spider + Myers Carpenter +License: LGPL-2+ +Comment: partially from ASFRecorder ( http://members.tripod.com/asfrecorder ) + http://sourceforge.net/projects/asfrecorder/ + +Files: plugins/libvorbis/* +Copyright: Felix 'Atmosfear' Buenemann +License: GPL-2+ +Comment: based on work of mplayer team - especialy Felix 'Atmosfear' Buenemann + +License: GPL-2+ + 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 St, Fifth Floor, Boston, MA + 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + version 2 can be found in "/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 Library 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 + Library General Public License for more details. + . + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU Library General Public License + version 2 can be found in "/usr/share/common-licenses/LGPL-2". diff -Nru avifile-0.7.48~20090503.ds/debian/libavifile-0.7-bin.install avifile-0.7.48~20090503.ds/debian/libavifile-0.7-bin.install --- avifile-0.7.48~20090503.ds/debian/libavifile-0.7-bin.install 1970-01-01 00:00:00.000000000 +0000 +++ avifile-0.7.48~20090503.ds/debian/libavifile-0.7-bin.install 2012-05-01 04:09:05.000000000 +0000 @@ -0,0 +1,13 @@ +usr/bin/avibench +usr/bin/avicat +usr/bin/avimake +usr/bin/avitype +usr/share/man/man1/avibench.1 +usr/share/man/man1/avicap.1 +usr/share/man/man1/avicat.1 +usr/share/man/man1/avimake.1 +usr/share/man/man1/aviplay.1 +usr/share/man/man1/avirec.1 +usr/share/man/man1/avirecompress.1 +usr/share/man/man1/avitype.1 +usr/share/man/man1/kv4lsetup.1 diff -Nru avifile-0.7.48~20090503.ds/debian/libavifile-0.7c2.install avifile-0.7.48~20090503.ds/debian/libavifile-0.7c2.install --- avifile-0.7.48~20090503.ds/debian/libavifile-0.7c2.install 2011-12-17 09:04:43.000000000 +0000 +++ avifile-0.7.48~20090503.ds/debian/libavifile-0.7c2.install 2012-05-01 04:09:05.000000000 +0000 @@ -1,19 +1,2 @@ -usr/bin/avibench -usr/bin/avicat -usr/bin/avimake -usr/bin/avitype -usr/lib/lib*.so.* -usr/lib/avifile-0.7/*.so -usr/lib/avifile-0.7/vidix/ -usr/share/man/man1/avibench.1 -usr/share/man/man1/avicat.1 -usr/share/man/man1/avimake.1 -usr/share/man/man1/avirec.1 -usr/share/man/man1/avitype.1 -usr/share/man/man1/avicap.1 -usr/share/man/man1/aviplay.1 -usr/share/man/man1/avirecompress.1 -usr/share/man/man1/kv4lsetup.1 -usr/share/avifile-0.7/ -usr/share/aclocal/ -usr/share/doc/libavifile-0.7c2/ +usr/lib/*/avifile-0.7/*.so +usr/lib/*/lib*.so.* diff -Nru avifile-0.7.48~20090503.ds/debian/libavifile-0.7-common.install avifile-0.7.48~20090503.ds/debian/libavifile-0.7-common.install --- avifile-0.7.48~20090503.ds/debian/libavifile-0.7-common.install 1970-01-01 00:00:00.000000000 +0000 +++ avifile-0.7.48~20090503.ds/debian/libavifile-0.7-common.install 2012-05-01 04:09:05.000000000 +0000 @@ -0,0 +1,2 @@ +usr/share/avifile-0.7/ +usr/share/doc/libavifile-0.7-common/ diff -Nru avifile-0.7.48~20090503.ds/debian/libavifile-0.7-dev.install avifile-0.7.48~20090503.ds/debian/libavifile-0.7-dev.install --- avifile-0.7.48~20090503.ds/debian/libavifile-0.7-dev.install 2011-12-17 08:32:48.000000000 +0000 +++ avifile-0.7.48~20090503.ds/debian/libavifile-0.7-dev.install 2012-05-01 04:09:05.000000000 +0000 @@ -1,5 +1,6 @@ -usr/include/ usr/bin/avifile-config -usr/lib/pkgconfig/ +usr/include/ +usr/lib/*/lib*.so +usr/lib/*/pkgconfig/ +usr/share/aclocal/ usr/share/man/man1/avifile-config.1 -usr/lib/lib*.so diff -Nru avifile-0.7.48~20090503.ds/debian/patches/ftbfs-gcc4.7.patch avifile-0.7.48~20090503.ds/debian/patches/ftbfs-gcc4.7.patch --- avifile-0.7.48~20090503.ds/debian/patches/ftbfs-gcc4.7.patch 1970-01-01 00:00:00.000000000 +0000 +++ avifile-0.7.48~20090503.ds/debian/patches/ftbfs-gcc4.7.patch 2012-05-09 09:04:30.000000000 +0000 @@ -0,0 +1,58 @@ +Description: Fix FTBFS for gcc-4.7 + * Fix warning: cast to pointer from integer of different size + * Fix error: cannot bind packed field +Bug-Debian: http://bugs.debian.org/667107 +Author: Ying-Chun Liu (PaulLiu) +Last-Update: 2012-05-09 +Index: avifile-0.7.48~20090503.ds/lib/aviread/AsfNetworkInputStream.cpp +=================================================================== +--- avifile-0.7.48~20090503.ds.orig/lib/aviread/AsfNetworkInputStream.cpp 2009-05-02 02:56:45.000000000 +0800 ++++ avifile-0.7.48~20090503.ds/lib/aviread/AsfNetworkInputStream.cpp 2012-05-09 17:00:42.256160769 +0800 +@@ -594,7 +594,7 @@ + close(m_iSocket); + m_iSocket = -1; + flushPipe(); +- return (void*)result; ++ return (void*)((intptr_t)result); + } + + void* AsfNetworkInputStream::threadStarter(void* arg) +@@ -939,7 +939,7 @@ + } + + AsfPacket* p; +- unsigned short& size = chhdr.size; ++ + //printf("STREAMPACKET 0x%x sz:%d %lld seq:%d part:%d sc:%d\n", chhdr.kind, size, rsize, chhdr.seq, chhdr.partflag, chhdr.size_confirm); + switch (chhdr.kind) + { +@@ -975,15 +975,15 @@ + m_bFinished = true; + continue; + } +- if (size > m_Header.max_pktsize) ++ if (((unsigned short)(chhdr.size)) > m_Header.max_pktsize) + { +- AVM_WRITE("ASF network reader", "size>m_Header.max_pktsize (%d > %d) ignoring...\n", size, m_Header.max_pktsize); ++ AVM_WRITE("ASF network reader", "size>m_Header.max_pktsize (%d > %d) ignoring...\n", ((unsigned short)(chhdr.size)), m_Header.max_pktsize); + continue; + } + + //AVM_WRITE("ASF network reader", "Packet size %d\n", size); + p = new AsfPacket(m_Header.max_pktsize); +- if (read(&(*p)[0], size) <= 0) ++ if (read(&(*p)[0], ((unsigned short)(chhdr.size))) <= 0) + { + p->release(); + AVM_WRITE("ASF network reader", "read() no more data\n"); +@@ -994,8 +994,8 @@ + //for (int i = 0; i < 20; i++) + // AVM_WRITE("ASF network reader", "%02x ",(uint_t) (*p)[inloaded + i]); + //AVM_WRITE("ASF network reader", "\n"); +- if (m_lfd >= 0 && size < m_Header.max_pktsize) +- memset(&(*p)[size], 0, m_Header.max_pktsize - size); // zero padding ++ if (m_lfd >= 0 && ((unsigned short)(chhdr.size)) < m_Header.max_pktsize) ++ memset(&(*p)[((unsigned short)(chhdr.size))], 0, m_Header.max_pktsize - ((unsigned short)(chhdr.size))); // zero padding + //AVM_WRITE("ASF network reader", 0, "Created packet %p %d - 0x%x (free %d : %.2f)\n", p, p->size(), (*p)[0], m_Header.max_pktsize - size, size/(float)m_Header.max_pktsize); + if (p->init(m_uiTimeshift) == 0) + { diff -Nru avifile-0.7.48~20090503.ds/debian/patches/series avifile-0.7.48~20090503.ds/debian/patches/series --- avifile-0.7.48~20090503.ds/debian/patches/series 2011-12-21 06:24:55.000000000 +0000 +++ avifile-0.7.48~20090503.ds/debian/patches/series 2012-05-09 08:18:49.000000000 +0000 @@ -8,3 +8,4 @@ fix-libav07-compat.patch fix-build-with-libav07.patch ftbfs-freebsd.patch +ftbfs-gcc4.7.patch diff -Nru avifile-0.7.48~20090503.ds/debian/rules avifile-0.7.48~20090503.ds/debian/rules --- avifile-0.7.48~20090503.ds/debian/rules 2011-12-17 09:26:46.000000000 +0000 +++ avifile-0.7.48~20090503.ds/debian/rules 2012-04-23 18:28:17.000000000 +0000 @@ -67,7 +67,7 @@ override_dh_auto_install: @echo ":: Preparing packages" - dh_auto_install -- pkgdocdir=/usr/share/doc/$(libraries) - @rm -f debian/tmp/usr/share/doc/$(libraries)/COPYING - @rm -f debian/tmp/usr/share/doc/$(libraries)/ChangeLog + dh_auto_install -- pkgdocdir=/usr/share/doc/lib$(aviversion)-common + @rm -f debian/tmp/usr/share/doc/lib$(aviversion)-common/COPYING + @rm -f debian/tmp/usr/share/doc/lib$(aviversion)-common/ChangeLog @chmod a+x debian/tmp/usr/share/$(aviversion)/scripts/avicap-*