Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs
In directory vz-cvs-3.sog:/tmp/cvs-serv11932
Modified Files:
gmerlin-avdecoder1.info
Added Files:
gmerlin-avdecoder1.patch
Log Message:
restored 1.1.0 version in stable and switched from speex3 to libspeex1
Index: gmerlin-avdecoder1.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/gmerlin-avdecoder1.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gmerlin-avdecoder1.info 30 Oct 2011 15:34:31 -0000 1.2
+++ gmerlin-avdecoder1.info 30 Oct 2011 15:47:03 -0000 1.3
@@ -1,14 +1,13 @@
Package: gmerlin-avdecoder1
-Version: 1.1.1
-Revision: 1
+Version: 1.1.0
+Revision: 4
###
-#Source: mirror:sourceforge:gmerlin/gmerlin-avdecoder-%v.tar.bz2
-# this is actually 1.1.1-pre1 from SVN, so the tarball hosted off of
-# my server until the official release.
-#Source: mirror:sourceforge:gmerlin/gmerlin-avdecoder-%v.tar.bz2
-Source: http://dropbox.at.or.at/dropbox/gmerlin-avdecoder-%v.tar.bz2
-Source-MD5: 47f32890a16537b191f3468242d348eb
-#Source-SHA1: ffde54c10be35a08ec4da6f4d3305787c943d0f3
+Source: mirror:sourceforge:gmerlin/gmerlin-avdecoder-%v.tar.gz
+Source-MD5: c1ea663e9da631453eec4ac79138b6c5
+#Source-SHA1: 1c230878456821fc5e59efd802146faf387f1deb
+###
+PatchFile: %n.patch
+PatchFile-MD5: 103f6e7c30bb12f8f3ef15919134d8d6
###
DocFiles: README NEWS COPYING AUTHORS INSTALL ChangeLog
###
@@ -24,9 +23,9 @@
decoding support for your application.
<<
#
-Depends: %N-shlibs (= %v-%r), libgettext8-shlibs (>=0.17-1),
libavcodec53-shlibs, libpostproc51-shlibs, libswscale2-shlibs,
libavformat53-shlibs, libfaad2-shlibs, libflac8 (>=1.2.1-1000),
libvorbis0-shlibs (>=1.2.0-1), libtheora0-shlibs (>=1.0-0.alpha5.100),
libspeex1-shlibs, libpng14-shlibs, libtiff-shlibs (>=3.8.2-1000), a52dec-shlibs
(>=0.7.4-2), libmpcdec5-shlibs (>=1.2.6-1), libcdio7-shlibs (>=0.79-1),
libmad-shlibs (>=0.15.1b-5), libgavl1-shlibs (>=1.2.0-1), libdca-shlibs,
libdvdread.3-shlibs (>=0.9.5-1), libjpeg8-shlibs, libopenjpeg-shlibs,
amrnb-shlibs, faac-shlibs, libgnugetopt-shlibs, lame-shlibs,
libx264-115-shlibs, xvidcore-shlibs, libogg-shlibs, libiconv,
libschroedinger-shlibs, liboil-0.3-shlibs
+Depends: %N-shlibs (= %v-%r), libgettext8-shlibs (>=0.17-1),
libavcodec52-shlibs (>=0.6.1-5), libpostproc51-shlibs (>=0.6.1-5),
libswscale0-shlibs (>=0.6.1-5), libavformat52-shlibs (>=0.6.1-5),
libfaad2-shlibs, libflac8 (>=1.2.1-1000), libvorbis0-shlibs (>=1.2.0-1),
libtheora0-shlibs (>=1.0-0.alpha5.100), libspeex1-shlibs, libpng14-shlibs,
libtiff-shlibs (>=3.8.2-1000), a52dec-shlibs (>=0.7.4-2), libmpcdec5-shlibs
(>=1.2.6-1), libcdio7-shlibs (>=0.79-1), libmad-shlibs (>=0.15.1b-5),
libgavl1-shlibs (>=1.2.0-1), libdca-shlibs, libdvdread.3-shlibs (>=0.9.5-1),
libjpeg8-shlibs, libopenjpeg-shlibs, amrnb-shlibs, faac-shlibs,
libgnugetopt-shlibs, lame-shlibs, libx264-98-shlibs, xvidcore-shlibs,
libogg-shlibs, libiconv, libschroedinger-shlibs, liboil-0.3-shlibs
#
-BuildDepends: fink (>= 0.24.12), autoconf (>=2.59-1), automake1.11, libtool2,
pkgconfig, gettext-tools (>=0.17-1), libgettext8-dev (>=0.17-1), libiconv-dev,
doxygen, libavcodec53-dev,libpostproc51-dev, libswscale2-dev,
libavformat53-dev, libavutil51-dev, libfaad2-dev, libflac8-dev (>=1.2.1-1000),
libvorbis0 (>=1.2.0-1), libtheora0 (>=1.0-0.alpha5.100), libspeex1, libpng14,
libtiff (>=3.8.2-1000), a52dec-dev (>=0.7.4-2), libmpcdec5 (>=1.2.6-1),
libcdio-dev (>=0.79-1), libmad (>=0.15.1b-5), libgavl1 (>=1.2.0-1), libdca-dev,
libdvdread.3 (>=0.9.5-1), libjpeg8, libopenjpeg, amrnb-dev, faac-dev,
libgnugetopt, lame-dev, libx264-115-dev, xvidcore, libogg, libschroedinger,
liboil-0.3
+BuildDepends: fink (>= 0.24.12), autoconf (>=2.59-1), automake1.10, libtool2,
pkgconfig, gettext-tools (>=0.17-1), libgettext8-dev (>=0.17-1), libiconv-dev,
doxygen, libavcodec52-dev (>=0.6.1-5),libpostproc51-dev (>=0.6.1-5),
libswscale0-dev (>=0.6.1-5), libavformat52-dev (>=0.6.1-5), libavutil50-dev
(>=0.6.1-5), libfaad2-dev, libflac8-dev (>=1.2.1-1000), libvorbis0 (>=1.2.0-1),
libtheora0 (>=1.0-0.alpha5.100), libspeex1,libpng14, libtiff (>=3.8.2-1000),
a52dec-dev (>=0.7.4-2), libmpcdec5 (>=1.2.6-1), libcdio-dev (>=0.79-1), libmad
(>=0.15.1b-5), libgavl1 (>=1.2.0-1), libdca-dev, libdvdread.3 (>=0.9.5-1),
libjpeg8, libopenjpeg, amrnb-dev, faac-dev, libgnugetopt, lame-dev,
libx264-98-dev, xvidcore, libogg, libschroedinger, liboil-0.3
BuildDependsOnly: true
#
# we are currently not using libmpeg2 and mjpegtools because we think FFMPEG
@@ -48,7 +47,7 @@
SplitOff: <<
Package: %n-shlibs
Description: Shared libraries for gmerlin-avdecoder
- Depends: libgettext8-shlibs (>=0.17-1), libavcodec53-shlibs,
libpostproc51-shlibs, libswscale2-shlibs, libavformat53-shlibs,
libfaad2-shlibs, libflac8 (>=1.2.1-1000), libvorbis0-shlibs (>=1.2.0-1),
libtheora0-shlibs (>=1.0-0.alpha5.100), libspeex1-shlibs, libpng14-shlibs,
libtiff-shlibs (>=3.8.2-1000), a52dec-shlibs (>=0.7.4-2), libmpcdec5-shlibs
(>=1.2.6-1), libcdio7-shlibs (>=0.79-1), libmad-shlibs (>=0.15.1b-5),
libgavl1-shlibs (>=1.2.0-1), libdca-shlibs, libdvdread.3-shlibs (>=0.9.5-1),
libjpeg8-shlibs, libopenjpeg-shlibs, amrnb-shlibs, faac-shlibs,
libgnugetopt-shlibs, lame-shlibs, libx264-115-shlibs, xvidcore-shlibs,
libogg-shlibs, libiconv, libschroedinger-shlibs, liboil-0.3-shlibs
+ Depends: libgettext8-shlibs (>=0.17-1), libavcodec52-shlibs (>=0.6.1-5),
libpostproc51-shlibs (>=0.6.1-5), libswscale0-shlibs (>=0.6.1-5),
libavformat52-shlibs (>=0.6.1-5), libfaad2-shlibs, libflac8 (>=1.2.1-1000),
libvorbis0-shlibs (>=1.2.0-1), libtheora0-shlibs (>=1.0-0.alpha5.100),
libspeex1-shlibs, libpng14-shlibs, libtiff-shlibs (>=3.8.2-1000), a52dec-shlibs
(>=0.7.4-2), libmpcdec5-shlibs (>=1.2.6-1), libcdio7-shlibs (>=0.79-1),
libmad-shlibs (>=0.15.1b-5), libgavl1-shlibs (>=1.2.0-1), libdca-shlibs,
libdvdread.3-shlibs (>=0.9.5-1), libjpeg8-shlibs, libopenjpeg-shlibs,
amrnb-shlibs, faac-shlibs, libgnugetopt-shlibs, lame-shlibs, libx264-98-shlibs,
xvidcore-shlibs, libogg-shlibs, libiconv, libschroedinger-shlibs,
liboil-0.3-shlibs
Files: <<
lib/libgmerlin_avdec.1.dylib
<<
@@ -61,7 +60,7 @@
#SplitOff2: <<
# Package: %N-bin
-# Depends: %N-shlibs (= %v-%r), libavcodec53-shlibs,
libpostproc51-shlibs, libswscale2-shlibs, libavformat53-shlibs,
libfaad2-shlibs, libflac8 (>=1.2.1-1000), libvorbis0-shlibs (>=1.2.0-1),
libtheora0-shlibs (>=1.0-0.alpha5.100), libspeex1-shlibs, libpng14-shlibs,
libtiff-shlibs (>=3.8.2-1000), a52dec-shlibs (>=0.7.4-2), libmpcdec5-shlibs
(>=1.2.6-1), libcdio7-shlibs (>=0.79-1), libmad-shlibs (>=0.15.1b-5),
libgavl1-shlibs (>=1.2.0-1), libdca-shlibs, libdvdread.3-shlibs (>=0.9.5-1),
libjpeg8-shlibs, libopenjpeg-shlibs, amrnb-shlibs, faac-shlibs,
libgnugetopt-shlibs, lame-shlibs, libx264-115-shlibs, xvidcore-shlibs,
libogg-shlibs, libschroedinger-shlibs
+# Depends: %N-shlibs (= %v-%r), libavcodec52-shlibs (>=0.6.1-5),
libpostproc51-shlibs (>=0.6.1-5), libswscale0-shlibs (>=0.6.1-5),
libavformat52-shlibs (>=0.6.1-5), libfaad2-shlibs, libflac8 (>=1.2.1-1000),
libvorbis0-shlibs (>=1.2.0-1), libtheora0-shlibs (>=1.0-0.alpha5.100),
libspeex1-shlibs, libpng14-shlibs, libtiff-shlibs (>=3.8.2-1000), a52dec-shlibs
(>=0.7.4-2), libmpcdec5-shlibs (>=1.2.6-1), libcdio7-shlibs (>=0.79-1),
libmad-shlibs (>=0.15.1b-5), libgavl1-shlibs (>=1.2.0-1), libdca-shlibs,
libdvdread.3-shlibs (>=0.9.5-1), libjpeg8-shlibs, libopenjpeg-shlibs,
amrnb-shlibs, faac-shlibs, libgnugetopt-shlibs, lame-shlibs, libx264-98-shlibs,
xvidcore-shlibs, libogg-shlibs, libschroedinger-shlibs
# Description: command line info for gmerlin-avdecoder
# Files: <<
# bin/bgavdump
--- NEW FILE: gmerlin-avdecoder1.patch ---
--- gmerlin-avdecoder-1.1.0/lib/aac_frame.c 2009-05-24 08:10:42.000000000
-0700
+++ gmerlin-avdecoder-1.1.0/lib/aac_frame.c 2009-12-28 22:47:14.000000000
-0800
@@ -26,11 +26,11 @@
#include <aac_frame.h>
#include <stdlib.h>
+#define LOG_DOMAIN "aac_frame"
+
#ifdef HAVE_NEAACDEC_H
#include <neaacdec.h>
-#define LOG_DOMAIN "aac_frame"
-
/*
* Backwards compatibility names (currently in neaacdec.h,
* but might be removed in future versions)
------------------------------------------------------------------------------
Get your Android app more play: Bring it to the BlackBerry PlayBook
in minutes. BlackBerry App World™ now supports Android™ Apps
for the BlackBerry® PlayBook™. Discover just how easy and simple
it is! http://p.sf.net/sfu/android-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
