Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv17637

Modified Files:
        transcode.info 
Log Message:
new version, switch to new imagemagick2 dep; actually have it work at all, 
rather than failing to detect critical deps and then continuing anyway because 
of CompileScript bug


Index: transcode.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/utils/transcode.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- transcode.info      3 Feb 2010 08:37:47 -0000       1.9
+++ transcode.info      4 Feb 2010 03:02:39 -0000       1.10
@@ -1,95 +1,139 @@
+
 Package: transcode
-Version: 1.0.0
-Revision: 1008
+Version: 1.1.0
+Revision: 1
 Depends: <<
        a52dec-shlibs,
+       amrnb-shlibs,
        bzip2-shlibs,
-       glib-shlibs,
-       gtk+-shlibs,
-       imagemagick1-shlibs,
+       faac-shlibs,
+       freetype219-shlibs (>= 2.3.8-2),
+       imagemagick2-shlibs,
        lame-shlibs,
-       lcms-shlibs,
-       libavcodec1-shlibs,
+       libavcodec51-shlibs,
+       libavformat52-shlibs,
+       libavutil49-shlibs,
        libdv4-shlibs,
-       libdvdcss-shlibs,
        libdvdread.3-shlibs,
-       libfame1-shlibs,
-       libgettext3-shlibs,
+       libfaad1-shlibs,
        libiconv,
        libjpeg-shlibs,
        libogg-shlibs,
-       libpng3-shlibs,
        libpostproc1-shlibs,
        libquicktime0-shlibs,
        libtheora0-shlibs,
-       libtiff-shlibs,
        libvorbis0-shlibs,
+       libx264-57-shlibs,
        libxml2-shlibs,
-       lzo-shlibs,
+       lzo2-shlibs,
        mpeg2dec-shlibs,
        sdl-shlibs (>= 1.2.9-1001),
-       x11-shlibs
+       x11-shlibs,
+       xvidcore-shlibs
 <<
-# see no dep on mjpegtools2-shlibs (seems it is /sw/lib/libmjpegutils.a that 
is linked in); libtool14-shlibs is superfluous;
+#BDep:d-b-f avoids IBD from imagemagick and similar messes
 BuildDepends: <<
        a52dec-dev,
-       bzip2-dev,
-       ffmpeg-dev,
-       glib,
-       gtk+,
-       imagemagick1-dev,
+       amrnb-dev,
+       faac-dev,
+       dpkg-base-files,
+       fink (>= 0.24.12),
+       freetype219 (>= 2.3.8-2),
+       imagemagick2-dev,
        lame-dev,
-       lcms,
-       libavcodec1-dev,
-       libavcodec1-dev,
+       libavcodec-dev,
+       libavformat-dev,
+       libavutil-dev,
        libdv4,
-       libdvdcss,
        libdvdread.3,
-       libfame1,
-       libgettext3-dev,
-       libiconv-bin,
+       libfaad1-dev,
        libiconv-dev,
        libjpeg,
        libogg,
-       libpng3,
        libpostproc1,
        libquicktime0 (>= 0.9.4-13),
        libtheora0,
-       libtiff,
-       libtool14,
        libvorbis0,
+       libx264-dev,
        libxml2,
        lzo,
-       mjpegtools2-dev (>= 1.6.2-1003),
        mpeg2dec,
        mpeg2dec-dev,
+       pkgconfig,
        sdl (>= 1.2.9-1001),
-       x11-dev
+       x11-dev,
+       xvidcore
 <<
-Source: http://www.jakemsr.com/transcode/transcode-%v.tar.gz
-Source-MD5: 28990470fb92a28e351cb96bcad0c890
+#Source: http://www.jakemsr.com/transcode/transcode-%v.tar.gz
+Source: http://download.berlios.de/tcforge/%n-%v.tar.bz2
+Source-MD5: 5ca205e32b546402a48ea8004a7b3232
 PatchScript: <<
 #!/bin/sh -ev
-  mv INSTALL INSTALL.txt
-  perl -pi -e 's,top_builddir\)$,$& -I/usr/X11R6/include 
-I/usr/X11R6/include/freetype2,' filter/Makefile.in
+       %{default_script}
   sed -i.bak -e '/^have_sdl\=\"no\"/,/confdefs/s,^if test 
x\"\$have,have_sdl=yes\
 &,' configure
   perl -pi -e 's,have_x86cpu=true,have_x86cpu=false,; s,#define ARCH_X86 
1,#undef ARCH_X86,' configure
-  chmod a+x configure
-  sed -i.bak -e '/#ifndef always_inline/,/^[[:space:]]*$/d' src/transcode.h
+       perl -pi -e 's,libpostproc/postprocess.h,postproc/postprocess.h,g' 
configure filter/filter_pp.c
+
+       # fink's current pkgs consolidate headers in ffmpeg/ but pkg
+       # here wants each in separate...easier to make compatbility
+       # links than to patch all the source files.
+       mkdir libavcodec
+       ln -s %p/include/ffmpeg/avcodec.h libavcodec
+       mkdir libavformat
+       ln -s %p/include/ffmpeg/avformat.h libavformat
+       mkdir libavutil
+       ln -s %p/include/ffmpeg/avutil.h libavutil
+
+       # ... but do need to patch configure detection itself since
+       # that does not pass any local -I
+       perl -pi -e 's,libavformat/avformat.h,ffmpeg/avformat.h,g' configure
+       perl -pi -e 's,libavcodec/avcodec.h,ffmpeg/avcodec.h,g' configure
+
+       perl -pi -e 's,-lXv,-L/usr/X11R6/lib -lXv,' filter/preview/Makefile.in
 <<
 SetCFLAGS: -O3 -fstrict-aliasing
 SetCXXFLAGS: -O3 -fstrict-aliasing
-NoSetLDFLAGS: true
-NoSetCPPFLAGS: true
-SetCPPFLAGS: -I/usr/X11R6/include/freetype2 -I%p/include/libquicktime
-SetLIBRARY_PATH: %p/lib:/usr/X11R6/lib
-ConfigureParams: --prefix=%p --mandir=%p/share/man --infodir=%i/share/info 
--with-libavcodec-prefix=%p --disable-libmpeg3 --enable-text --enable-libfame 
--disable-libfametest --enable-lzo --enable-ogg --enable-libquicktime 
--enable-gtk --enable-sdl --enable-mjpegtools --enable-theora --enable-libdv 
--enable-libxml2 --enable-vorbis --enable-a52 --enable-netstream --enable-ffbin 
--enable-freetype2 --enable-libpostproc --enable-imagemagick --enable-xio 
--with-libpostproc-prefix=%p --with-libpostproc-includes=%p/include/postproc 
--with-freetype2-prefix=/usr/X11R6 --with-iconv-prefix=%p --with-a52-prefix=%p 
--with-lame-prefix=%p --with-libdvdread-prefix=%p --with-libjpeg-prefix=%p 
--with-libmpeg2-prefix=%p --with-lzo-prefix=%p
-CompileScript: export CPATH=%p/include; ./configure %c; make
+ConfigureParams: <<
+       --mandir=%p/share/man \
+       --enable-libavcodec \
+               --with-libavcodec-prefix=%p \
+       --enable-libavformat \
+       --enable-libmpeg2 \
+               --with-libmpeg2-prefix=%p \
+       --enable-libpostproc \
+               --with-libpostproc-prefix=%p \
+       --enable-freetype2 \
+               --with-freetype2-prefix=%p \
+       \
+               --with-lame-prefix=%p \
+       --enable-ogg \
+       --enable-vorbis \
+       --enable-theora \
+       \
+               --with-libdvdread-prefix=%p \
+       --enable-libdv \
+       --enable-libquicktime \
+       --enable-lzo \
+               --with-lzo-prefix=%p \
+       --enable-a52 \
+               --with-a52-prefix=%p \
+       --enable-faac \
+               --with-faac-prefix=%p \
+       --enable-libxml2 \
+       --disable-mjpegtools \
+       --enable-sdl \
+       --enable-imagemagick \
+       \
+               --with-libjpeg-prefix=%p \
+       \
+               --with-iconv-prefix=%p \
+       --enable-xio
+<<
 InstallScript: <<
- make install prefix=%i mandir=%i/share/man
+       make install DESTDIR=%d
 <<
-DocFiles: README* COPYING AUTHORS TODO 
+DocFiles: AUTHORS COPYING ChangeLog README STYLE TODO
 #
 Description: Video Stream Processing Tool
 DescDetail: <<
@@ -104,9 +148,6 @@
 sharpening, denoisifying, and cutting.
 <<
 DescPackaging: <<
-_ precautions needed for freetype2 to be found
-       (PatchScript, SetLIBRARY_PATH, --with-freetype2-prefix),
-  and then to avoid  a BuildConflicts with freetype1 (CPPFLAGS, CPATH).
 - the "enable-sdl" needs the last item in the PatchScript.
 - oss can't be enabled: is broken on Tiger ("conficting types" in soundcard.h).
 - similarly for libdivxdecore ( by adding "-I/sw/include/divx" to the 
CPPFLAGS).
@@ -115,12 +156,18 @@
   of flags -I/usr/include or -L/usr/lib in the build, which might ("random 
order..")
   create somewhere an undesired effect (eg linking one of the items with 
libiconv
   in /usr instead of in %p). 
-- otool gives no evidence for the necessity of the following former deps:
-       ffmpeg lame mjpegtools2-shlibs mpeg2dec xvidcore-shlibs
-   Removed them tentatively, together with the corresponding build-dep xvidcore
-       but there maybe still something to fix to enable linking to some of 
those ?
 
        Formerly maintained by Christian Schroeder
+
+       Fink's libpostproc headers are in %p/include/postproc, not
+       %p/include/libpostproc as transcode is expecting. Not sure if
+       expecting or require newer libpostproc version than fink has.
+
+       Doesn't build with current mjpegtools in fink (needs newer
+       one?)
+
+       Hardcodes -lXv in a makefile, ignoring some related autoconf
+       detection, so need to hardcode -L for it there too.
 <<
 License: GPL
 Maintainer: None <fink-de...@lists.sourceforge.net>


------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to