Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv32586
Modified Files:
transcode.info
Added Files:
transcode.patch
Log Message:
bugfixes
new maintainer
>From tracker:
>https://sourceforge.net/tracker/?func=detail&aid=3018128&group_id=17203&atid=414256
--- NEW FILE: transcode.patch ---
diff -ru transcode-1.1.0.orig/export/export_xvid4.c
transcode-1.1.0/export/export_xvid4.c
--- transcode-1.1.0.orig/export/export_xvid4.c 2007-08-11 10:15:45.000000000
+0200
+++ transcode-1.1.0/export/export_xvid4.c 2010-06-18 19:11:17.000000000
+0200
@@ -91,6 +91,7 @@
#endif
#define XVID_CONFIG_FILE "xvid4.cfg"
+
/*****************************************************************************
* XviD symbols grouped in a nice struct.
****************************************************************************/
@@ -1248,16 +1249,26 @@
XVID_SHARED_LIB_SUFX, XVID_API_MAJOR(XVID_API));
#endif
#ifdef OS_DARWIN
- tc_snprintf(soname[1], 4095, "%s.%d.%s", XVID_SHARED_LIB_BASE,
+ tc_snprintf(soname[1], 4095, "%s/../%s.%d.%s", path,XVID_SHARED_LIB_BASE,
XVID_API_MAJOR(XVID_API), XVID_SHARED_LIB_SUFX);
#else
tc_snprintf(soname[1], 4095, "%s.%s.%d", XVID_SHARED_LIB_BASE,
XVID_SHARED_LIB_SUFX, XVID_API_MAJOR(XVID_API));
#endif
+#ifdef OS_DARWIN
+ tc_snprintf(soname[2], 4095, "%s/%s.%s", path, XVID_SHARED_LIB_BASE,
+ XVID_SHARED_LIB_SUFX);
+#else
tc_snprintf(soname[2], 4095, "%s/%s.%s", path, XVID_SHARED_LIB_BASE,
XVID_SHARED_LIB_SUFX);
+#endif
+#ifdef OS_DRAWIN
tc_snprintf(soname[3], 4095, "%s.%s", XVID_SHARED_LIB_BASE,
XVID_SHARED_LIB_SUFX);
+#else
+ tc_snprintf(soname[3], 4095, "%s/../%s.%s",XVID_SHARED_LIB_BASE,
+ XVID_SHARED_LIB_SUFX);
+#endif
/* Let's try each shared lib until success */
for(i=0; i<4; i++) {
diff -ru transcode-1.1.0.orig/filter/filter_logoaway.c
transcode-1.1.0/filter/filter_logoaway.c
--- transcode-1.1.0.orig/filter/filter_logoaway.c 2007-07-30
22:53:37.000000000 +0200
+++ transcode-1.1.0/filter/filter_logoaway.c 2010-06-18 18:50:44.000000000
+0200
@@ -694,6 +694,8 @@
data[instance]->vcolor = 128;
data[instance]->alpha = 0;
data[instance]->dump = 0;
+ data[instance]->image = (Image *)NULL;
+ data[instance]->dumpimage = (Image *)NULL;
// filter init ok.
@@ -808,7 +810,8 @@
if (data[instance]->dumpimage != (Image *)NULL) {
DestroyImage(data[instance]->dumpimage);
DestroyImageInfo(data[instance]->dumpimage_info);
- DestroyConstitute();
+ /*DestroyConstitute();*/
+ ConstituteComponentTerminus();
}
DestroyExceptionInfo(&data[instance]->exception_info);
DestroyMagick();
Index: transcode.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/transcode.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- transcode.info 8 Jun 2010 13:10:23 -0000 1.11
+++ transcode.info 8 Sep 2010 20:58:43 -0000 1.12
@@ -1,14 +1,14 @@
Package: transcode
Version: 1.1.0
-Revision: 2
+Revision: 3
Depends: <<
a52dec-shlibs,
amrnb-shlibs,
bzip2-shlibs,
faac-shlibs,
freetype219-shlibs (>= 2.3.8-2),
- imagemagick2-shlibs,
+ imagemagick (>=6.5.8-4),
lame-shlibs,
libavcodec51-shlibs,
libavformat52-shlibs,
@@ -37,8 +37,10 @@
amrnb-dev,
faac-dev,
dpkg-base-files,
+ ffmpeg-dev,
fink (>= 0.24.12),
freetype219 (>= 2.3.8-2),
+ gsm,
imagemagick2-dev,
lame-dev,
libavcodec-dev,
@@ -56,7 +58,7 @@
libvorbis0,
libx264-dev,
libxml2,
- lzo,
+ lzo2,
mpeg2dec,
mpeg2dec-dev,
pkgconfig,
@@ -67,6 +69,8 @@
#Source: http://www.jakemsr.com/transcode/transcode-%v.tar.gz
Source: http://download.berlios.de/tcforge/%n-%v.tar.bz2
Source-MD5: 5ca205e32b546402a48ea8004a7b3232
+PatchFile: %n.patch
+PatchFile-MD5: 59af83357689d82d256969b860e4c6ce
PatchScript: <<
#!/bin/sh -ev
%{default_script}
@@ -107,6 +111,8 @@
--with-freetype2-prefix=%p \
\
--with-lame-prefix=%p \
+ --disable-mjpegtools \
+ --enable-xvid \
--enable-ogg \
--enable-vorbis \
--enable-theora \
@@ -121,14 +127,14 @@
--enable-faac \
--with-faac-prefix=%p \
--enable-libxml2 \
- --disable-mjpegtools \
--enable-sdl \
--enable-imagemagick \
\
--with-libjpeg-prefix=%p \
\
--with-iconv-prefix=%p \
- --enable-xio
+ --enable-xio \
+ --enable-x264
<<
InstallScript: <<
make install DESTDIR=%d
@@ -170,5 +176,5 @@
detection, so need to hardcode -L for it there too.
<<
License: GPL
-Maintainer: None <fink-de...@lists.sourceforge.net>
+Maintainer: Oliver Cordes <ocor...@astro.uni-bonn.de>
Homepage: http://www.transcoding.org/
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
