UPDATE: multimedia/transcode

2007-01-12 Thread Nikns Siankin
Must be used with ffmpeg update sent before.


http://secure.lv/~nikns/stuff/ports/ffmpeg-20070110.diff

Index: transcode/Makefile
===
RCS file: /cvs/ports/multimedia/transcode/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- transcode/Makefile  16 Dec 2006 12:22:34 -  1.12
+++ transcode/Makefile  2 Jan 2007 20:40:42 -
@@ -2,8 +2,7 @@
 
 COMMENT=   "video stream processing tools"
 
-DISTNAME=  transcode-1.0.2
-PKGNAME=   ${DISTNAME}p2
+DISTNAME=  transcode-1.0.3rc2
 CATEGORIES=multimedia
 
 HOMEPAGE=  http://www.transcoding.org/
@@ -16,8 +15,7 @@
 WANTLIB=   ICE SM X11 Xaw Xext Xi Xpm Xt Xv c freetype \
m pthread usbhid z glib gmodule intl
 
-MASTER_SITES=  http://www.jakemsr.com/transcode/ \
-   http://kraymer.de/mirroring/
+MASTER_SITES=  http://fromani.exit1.org/
 
 FLAVORS=   lzo mjpegtools quicktime
 FLAVOR?=
Index: transcode/distinfo
===
RCS file: /cvs/ports/multimedia/transcode/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- transcode/distinfo  13 Nov 2005 21:11:13 -  1.2
+++ transcode/distinfo  2 Jan 2007 20:40:42 -
@@ -1,4 +1,4 @@
-MD5 (transcode-1.0.2.tar.gz) = e353c0ab7e927a8672528e05a9ae960b
-RMD160 (transcode-1.0.2.tar.gz) = 5a0093b3d395180396a662dc765c179cd687
-SHA1 (transcode-1.0.2.tar.gz) = 831a55a0218913e43261eb614ccca34a0d1b3d0d
-SIZE (transcode-1.0.2.tar.gz) = 2347861
+MD5 (transcode-1.0.3rc2.tar.gz) = 85a9fbabf4fe3fc5dc8bfa99407ddd0a
+RMD160 (transcode-1.0.3rc2.tar.gz) = 35000d3a5dfc0f385e6ffd258514eb0a84aa0d7a
+SHA1 (transcode-1.0.3rc2.tar.gz) = 2278fc943893bd659c0dde1b22b27edbbfccc474
+SIZE (transcode-1.0.3rc2.tar.gz) = 2388713
Index: transcode/pkg/PFRAG.i386
===
RCS file: /cvs/ports/multimedia/transcode/pkg/PFRAG.i386,v
retrieving revision 1.2
diff -u -r1.2 PFRAG.i386
--- transcode/pkg/PFRAG.i38613 Nov 2005 21:11:13 -  1.2
+++ transcode/pkg/PFRAG.i3862 Jan 2007 20:40:42 -
@@ -2,6 +2,3 @@
 @comment lib/transcode/filter_dilyuvmmx.a
 @comment lib/transcode/filter_dilyuvmmx.la
 lib/transcode/filter_dilyuvmmx.so
[EMAIL PROTECTED] lib/transcode/filter_tomsmocomp.a
[EMAIL PROTECTED] lib/transcode/filter_tomsmocomp.la
-lib/transcode/filter_tomsmocomp.so



Re: update: multimedia/transcode

2005-10-19 Thread Jacob Meuser
On Tue, Oct 18, 2005 at 05:25:45PM +0200, Stephan Tesch wrote:
> Am Montag, 17. Oktober 2005 02:14 schrieb Jacob Meuser:
> 
> Hi Jacob,
> 
> > can you try the following?  should keep it from going out of bounds
> > at least.  doesn't seem to cause any problems in the demuxing
> > as far as I can see.
> 
> Thanks, it seems to work. I've tried transcoding a vob, which did fail last 
> time. I used transcode-0.6.14p2. Haven't tested it with 1.0.1, yet. Should I?

the patch was actually made against 1.0.1.  that code has been there
for years.  might have been there even longer if not for the new
malloc() ;)

I am discussing a slightly more accurate fix with other transcode
folks ... there will probably be a 1.0.2 release this week.

thanks again for providing a backtrace.

-- 
<[EMAIL PROTECTED]>



Re: update: multimedia/transcode

2005-10-18 Thread Stephan Tesch
Am Montag, 17. Oktober 2005 02:14 schrieb Jacob Meuser:

Hi Jacob,

> can you try the following?  should keep it from going out of bounds
> at least.  doesn't seem to cause any problems in the demuxing
> as far as I can see.

Thanks, it seems to work. I've tried transcoding a vob, which did fail last 
time. I used transcode-0.6.14p2. Haven't tested it with 1.0.1, yet. Should I?

Regards,
Stephan



Re: update: multimedia/transcode

2005-10-16 Thread Jacob Meuser
On Sun, Oct 16, 2005 at 11:01:54PM +0200, Stephan Tesch wrote:

> #0  0x1c007cba in probe_picext (buffer=0x8a60effe "\205D"  out of bounds>)
> 
> at 
> /usr/ports/multimedia/transcode/w-transcode-0.6.14p2/transcode-0.6.14/import/aux_pes.c:277
> 277   return(buffer[2] & 3);
> (gdb) where
> #0  0x1c007cba in probe_picext (buffer=0x8a60effe "\205D"  out of bounds>)
> 
> at 
> /usr/ports/multimedia/transcode/w-transcode-0.6.14p2/transcode-0.6.14/import/aux_pes.c:277
> #1  0x1c00896d in scan_pack_ext (buf=0x8a60e800 "")

thanks.

can you try the following?  should keep it from going out of bounds
at least.  doesn't seem to cause any problems in the demuxing
as far as I can see.

-- 
<[EMAIL PROTECTED]>

$OpenBSD$
--- import/scan_pack.c.orig Sun Oct 16 16:02:57 2005
+++ import/scan_pack.c  Sun Oct 16 16:29:02 2005
@@ -141,10 +141,10 @@ int scan_pack_ext(char *buf)
 
   int n, ret_code=-1;
   
-  for(n=0; n>4)==8){
- ret_code = probe_picext(buf+n+4);
+ ret_code = probe_picext((uint8_t *)buf+n+4);
   }
   } // probe extension header
   



Re: update: multimedia/transcode

2005-10-16 Thread Stephan Tesch
Am Donnerstag, 13. Oktober 2005 03:32 schrieb Jacob Meuser:

Hi Jacob,

> check if it was tcdemux that segfaulted.  if it is. and you can get
> useful backtrace, I'd like to see it.  bugs in the VOB demuxing code
> seem to have been exposed by the new malloc ... the segfaults started
> suddenly for me a few months ago on -current.  I've tried tracking
> down where exctly the problem code is, but I have not pinpointed it
> yet.

It seems to be tcdemux. Here's a trace of the segfault:

GNU gdb 6.3
Copyright 2004 Free Software Foundation, Inc.
GDB is free software, covered by the GNU General Public License, and you are
welcome to change it and/or distribute copies of it under certain conditions.
Type "show copying" to see the conditions.
There is absolutely no warranty for GDB.  Type "show warranty" for details.
This GDB was configured as "i386-unknown-openbsd3.8"...
Core was generated by `tcdemux'.
Program terminated with signal 11, Segmentation fault.
Reading symbols from /usr/local/lib/libdvdread.so.3.0...done.
Loaded symbols for /usr/local/lib/libdvdread.so.3.0
Reading symbols from /usr/local/lib/libdv.so.4.2...done.
Loaded symbols for /usr/local/lib/libdv.so.4.2
Reading symbols from /usr/lib/libm.so.2.0...done.
Loaded symbols for /usr/lib/libm.so.2.0
Reading symbols from /usr/lib/libz.so.4.1...done.
Loaded symbols for /usr/lib/libz.so.4.1
Reading symbols from /usr/lib/libpthread.so.6.1...done.
Loaded symbols for /usr/lib/libpthread.so.6.1
Reading symbols from /usr/lib/libc.so.38.2...done.
Loaded symbols for /usr/lib/libc.so.38.2
Reading symbols from /usr/libexec/ld.so...done.
Loaded symbols for /usr/libexec/ld.so
#0  0x1c007cba in probe_picext (buffer=0x8a60effe "\205D" )

at 
/usr/ports/multimedia/transcode/w-transcode-0.6.14p2/transcode-0.6.14/import/aux_pes.c:277
277   return(buffer[2] & 3);
(gdb) where
#0  0x1c007cba in probe_picext (buffer=0x8a60effe "\205D" )

at 
/usr/ports/multimedia/transcode/w-transcode-0.6.14p2/transcode-0.6.14/import/aux_pes.c:277
#1  0x1c00896d in scan_pack_ext (buf=0x8a60e800 "")

at 
/usr/ports/multimedia/transcode/w-transcode-0.6.14p2/transcode-0.6.14/import/scan_pack.c:153
#2  0x1c006cfe in tcdemux_thread (ipipe=0xcfbeb4ac)

at 
/usr/ports/multimedia/transcode/w-transcode-0.6.14p2/transcode-0.6.14/import/demuxer.c:574
#3  0x1c001c49 in main (argc=3, argv=0xcfbeb72f)
   
at 
/usr/ports/multimedia/transcode/w-transcode-0.6.14p2/transcode-0.6.14/import/tcdemux.c:369

Hope this helps. If you need any more testing, I'll be happy to help you.

Regards,
Stephan



Re: update: multimedia/transcode

2005-10-13 Thread Stephan Tesch
Am Donnerstag, 13. Oktober 2005 03:32 schrieb Jacob Meuser:

> can you verify this happen with 0.6.14 on -current too?

It happens, too. And yes, I ran it from dvdrip, but also directly from the 
shell.

*** WARNING: The option -V is deprecated. ***
*** Transcode internal frame handling is now in YV12 / YUV420 ***
*** format by default because most codecs can only handle this format, ***
*** otherwise leading to unnecessary time and quality wasting conversions. ***
*** If you want to have to "old" behaviour (RGB24 as internal format), ***
*** then please use the new -1/--use_rgb option ***
transcode v0.6.14 (C) 2001-2003 Thomas Oestreich, 2003-2004 T. Bitterberg
libdvdread: Using libdvd version 0.3 for DVD access
libdvdread: Couldn't find device name.
libdvdread: Can't open file VIDEO_TS.IFO.
[transcode] (probe) suggested AV correction -D 2 (80 ms) | AV 80 ms | 0 ms
[transcode] auto-probing source /home/tesch/dvdrip/test/vob/002 (ok)
[transcode] V: import format| MPEG-2  (V=vob|A=vob)
[transcode] V: AV demux/sync| (1) sync AV at initial MPEG sequence
[transcode] V: import frame | 720x576  1.25:1  encoded @ 4:3
[transcode] V: de-interlace | (mode=3) zoom to full frame (slow)
[transcode] V: new aspect ratio | 640x480  1.33:1 (-B)
[transcode] V: bits/pixel   | 0.146 (low)
[transcode] V: decoding fps,frc | 25.000,0
[transcode] V: multi-pass   | (mode=2) reading data (pass2) from divx4.log
[transcode] V: Y'CbCr   | YV12/I420
[transcode] A: import format| 0x2001  AC3/A52  [48000,16,2]  448 kbps
[transcode] A: export format| 0x55MPEG layer-3 [48000,16,2]  128 kbps
[transcode] V: encoding fps,frc | 25.000,3
[transcode] A: bytes per frame  | 7680 (7680.00)
[transcode] A: adjustment   | [EMAIL PROTECTED]
[transcode] A: rescale stream   | 3.800
[transcode] V: IA32 accel mode  | sse (sse mmxext mmx asm C)
tc_memcpy: using mmxext for memcpy
[transcode] V: video buffer | 10 @ 720x576
[import_vob.so] v0.6.0 (2003-10-02) (video) MPEG-2 | (audio) MPEG/AC3/PCM | 
(subtitle)
[export_xvid4.so] v0.0.5 (2003-12-05) (video) XviD 1.0.x series (aka API 4.0) 
| (audio) MPEG/AC3/PCM
[import_vob.so] tccat -i "/home/tesch/dvdrip/test/vob/002" -t vob -d 0 -S 0 | 
tcdemux -a 0 -x ac3 -S 0 -M 1 -d 0 | tcextract -t vob -a 0 -x ac3 -d 0 | 
tcdecode -x a52 -d 0 -A 1
[import_vob.so] tccat -i "/home/tesch/dvdrip/test/vob/002" -t vob -d 0 -S 0 | 
tcdemux -s 0x80 -x mpeg2 -S 0 -M 1 -d 0 | tcextract -t vob -a 0 -x mpeg2 -d 0 
| tcdecode -x mpeg2 -d 0 -y yv12
[export_xvid4.so] Neither './xvid4.cfg' nor '~/.transcode/xvid4.cfg'
[export_xvid4.so] found. Default settings will be used instead.
tc_memcpy: using mmxext for memcpy
tc_memcpy: using mmxext for memcpy
No accelerated IMDCT transform found
Audio: using new version
Audio: using lame-3.96.1
[/usr/ports/multimedia/transcode/w-transcode-0.6.14p2/transcode-0.6.14/src/encoder.c]
 
Delaying audio (0)
Segmentation fault (core dumped)   1.03 fps, EMT: 0:00:53, ( 0| 0| 9)
Segmentation fault (core dumped)   1.03 fps, EMT: 0:00:53, ( 0| 0| 9)
encoding frames [00-001338],   1.03 fps, EMT: 0:00:53, ( 0| 0| 1)
clean up | frame threads | unload modules | cancel signal | internal threads | 
done
[transcode] clipped 9591 audio samples
[transcode] encoded 1339 frames (0 dropped, 0 cloned), clip length  53.56 s


> check if it was tcdemux that segfaulted.  if it is. and you can get
> useful backtrace, I'd like to see it.

OK, I'll try to tackle this on the weekend.

Regards,
Stephan



Re: update: multimedia/transcode

2005-10-12 Thread Jacob Meuser
On Wed, Oct 12, 2005 at 11:43:09PM +0200, Stephan Tesch wrote:
> Am Dienstag, 11. Oktober 2005 06:04 schrieb Jacob Meuser:
> 
> Hi Jacob,
> 
> > yeah, my bad.  forgot I had taken that out.
> >
> > new patch attached.
> 
> The package builds fine. But I got a problem with transcode itself. It 
> segfaults on my 3.8-current system (snapshot from middle of Sep). The problem 
> looks like this:
> 
> *** WARNING: The option -V is deprecated. ***

running transcode from dvd::rip?

> Segmentation fault (core dumped)   2.02 fps, EMT: 0:00:13, ( 0| 0| 9)

> If you need any additional information, just say so.

can you verify this happen with 0.6.14 on -current too?

check if it was tcdemux that segfaulted.  if it is. and you can get
useful backtrace, I'd like to see it.  bugs in the VOB demuxing code
seem to have been exposed by the new malloc ... the segfaults started
suddenly for me a few months ago on -current.  I've tried tracking
down where exctly the problem code is, but I have not pinpointed it
yet.

-- 
<[EMAIL PROTECTED]>



Re: update: multimedia/transcode

2005-10-12 Thread Stephan Tesch
Am Dienstag, 11. Oktober 2005 06:04 schrieb Jacob Meuser:

Hi Jacob,

> yeah, my bad.  forgot I had taken that out.
>
> new patch attached.

The package builds fine. But I got a problem with transcode itself. It 
segfaults on my 3.8-current system (snapshot from middle of Sep). The problem 
looks like this:

*** WARNING: The option -V is deprecated. ***
*** Transcode internal frame handling is now in YV12 / YUV420 ***
*** format by default because most codecs can only handle this format, ***
*** otherwise leading to unnecessary time and quality wasting conversions. ***
*** If you want to have to "old" behaviour (RGB24 as internal format), ***
*** then please use the new -1/--use_rgb option ***
transcode v1.0.1 (C) 2001-2003 Thomas Oestreich, 2003-2004 T. Bitterberg
libdvdread: Using libdvd version 0.3 for DVD access
libdvdread: Couldn't find device name.
libdvdread: Can't open file VIDEO_TS.IFO.
[transcode] (probe) suggested AV correction -D 2 (80 ms) | AV 80 ms | 0 ms
[transcode] auto-probing source /home/tesch/dvdrip/test/vob/003 (ok)
[transcode] V: import format| MPEG-2  (V=vob|A=null)
[transcode] V: AV demux/sync| (1) sync AV at initial MPEG sequence
[transcode] V: import frame | 720x576  1.25:1  encoded @ 4:3
[transcode] V: de-interlace | (mode=3) zoom to full frame (slow)
[transcode] V: new aspect ratio | 640x480  1.33:1 (-B)
[transcode] V: clip frame (->)  | 624x480
[transcode] V: bits/pixel   | 0.150
[transcode] V: decoding fps,frc | 25.000,0
[transcode] V: multi-pass   | (mode=1) writing data (pass 1) to divx4.log
[transcode] V: Y'CbCr   | YV12/I420
[transcode] A: import format| 0x2001  AC3/A52  [48000,16,2]  448 kbps
[transcode] A: export   | disabled
[transcode] V: encoding fps,frc | 25.000,3
[transcode] A: bytes per frame  | 7680 (7680.00)
[transcode] A: adjustment   | [EMAIL PROTECTED]
[transcode] A: rescale stream   | 4.219
[transcode] V: IA32/AMD64 accel | sse (sse mmxext mmx asm C)
tc_memcpy: using sse for memcpy
[transcode] V: video buffer | 10 @ 720x576
[import_null.so] v0.2.0 (2002-01-19) (video) null | (audio) null
[import_vob.so] v0.6.0 (2003-10-02) (video) MPEG-2 | (audio) MPEG/AC3/PCM | 
(subtitle)
[export_null.so] v0.1.2 (2001-08-17) (video) null | (audio) null
[export_xvid4.so] v0.0.5 (2003-12-05) (video) XviD 1.0.x series (aka API 4.0) 
| (audio) MPEG/AC3/PCM
[import_vob.so] tccat -i "/home/tesch/dvdrip/test/vob/003" -t vob -d 0 -S 0 | 
tcdemux -s 0x80 -x mpeg2 -S 0 -M 1 -d 0 | tcextract -t vob -a 0 -x mpeg2 -d 0 
| tcdecode -x mpeg2 -d 0 -y yv12
[export_xvid4.so] Neither './xvid4.cfg' nor '~/.transcode/xvid4.cfg'
[export_xvid4.so] found. Default settings will be used instead.
tc_memcpy: using sse for memcpy
[/usr/ports/multimedia/transcode/w-transcode-1.0.1/transcode-1.0.1/import/decode_mpeg2.c]
 
libmpeg2 0.4.0b loop decoder
[/usr/ports/multimedia/transcode/w-transcode-1.0.1/transcode-1.0.1/import/decode_mpeg2.c]
 
libmpeg2 acceleration: mmxext
[/usr/ports/multimedia/transcode/w-transcode-1.0.1/transcode-1.0.1/src/encoder.c]
 
Delaying audio (0)
Segmentation fault (core dumped)   2.02 fps, EMT: 0:00:13, ( 0| 0| 9)
encoding frames [00-000338],   2.04 fps, EMT: 0:00:13, ( 0| 0| 0)
clean up | frame threads | unload modules | cancel signal | internal threads | 
done
[transcode] encoded 339 frames (0 dropped, 0 cloned), clip length  13.56 s

If you need any additional information, just say so.

Regards,
Stephan



Re: update: multimedia/transcode

2005-10-10 Thread Jacob Meuser
On Mon, Oct 10, 2005 at 11:12:40PM +, Christian Weisgerber wrote:
> Stephan Tesch <[EMAIL PROTECTED]> wrote:
> 
> > > attached is a patch to update multimedia/transcode to the 1.0.1 release.
> > 
> > Patching the -current source tree worked ok. But I'm having these problems 
> > while building the port on i386:
> 
> > ===>  Building package for transcode-1.0.1
> > Switching to /usr/ports/multimedia/transcode/pkg/PFRAG.i386
> > Error in package: 
> > "/usr/ports/multimedia/transcode/w-transcode-1.0.1/fake-i386//usr/local/lib/transcode/export_net.so"
> >  
> > does not exist
> > Error in package: 
> > "/usr/ports/multimedia/transcode/w-transcode-1.0.1/fake-i386//usr/local/lib/transcode/import_net.so"
> >  
> > does not exist
> 
> Same here on amd64.  I guess these modules aren't even enabled by
> configure, because it says
> 
> ...
> core options
> 
> static AV-frame buffering  yes
> network (sockets) streams  no
> ...
> 
> Just a missing --enable-netstream?

yeah, my bad.  forgot I had taken that out.

new patch attached.

-- 
<[EMAIL PROTECTED]>


tc.diff.gz
Description: application/gunzip


Re: update: multimedia/transcode

2005-10-10 Thread Christian Weisgerber
Stephan Tesch <[EMAIL PROTECTED]> wrote:

> > attached is a patch to update multimedia/transcode to the 1.0.1 release.
> 
> Patching the -current source tree worked ok. But I'm having these problems 
> while building the port on i386:

> ===>  Building package for transcode-1.0.1
> Switching to /usr/ports/multimedia/transcode/pkg/PFRAG.i386
> Error in package: 
> "/usr/ports/multimedia/transcode/w-transcode-1.0.1/fake-i386//usr/local/lib/transcode/export_net.so"
>  
> does not exist
> Error in package: 
> "/usr/ports/multimedia/transcode/w-transcode-1.0.1/fake-i386//usr/local/lib/transcode/import_net.so"
>  
> does not exist

Same here on amd64.  I guess these modules aren't even enabled by
configure, because it says

...
core options

static AV-frame buffering  yes
network (sockets) streams  no
...

Just a missing --enable-netstream?

-- 
Christian "naddy" Weisgerber  [EMAIL PROTECTED]



Re: update: multimedia/transcode

2005-10-10 Thread Stephan Tesch
Am Montag, 10. Oktober 2005 09:55 schrieb Jacob Meuser:

Hi Jacob,

> attached is a patch to update multimedia/transcode to the 1.0.1 release.

Patching the -current source tree worked ok. But I'm having these problems 
while building the port on i386:

Making install in testsuite
test -z "/usr/local/share/doc/transcode" 
|| 
/usr/ports/multimedia/transcode/w-transcode-1.0.1/transcode-1.0.1/autotools/install-sh
 
-d 
"/usr/ports/multimedia/transcode/w-transcode-1.0.1/fake-i386/usr/local/share/doc/transcode"
 install -c -o root -g bin -m 444 
'/usr/ports/multimedia/transcode/w-transcode-1.0.1/transcode-1.0.1/ChangeLog' 
'/usr/ports/multimedia/transcode/w-transcode-1.0.1/fake-i386/usr/local/share/doc/transcode/ChangeLog'
===>  Building package for transcode-1.0.1
Switching to /usr/ports/multimedia/transcode/pkg/PFRAG.i386
Error in package: 
"/usr/ports/multimedia/transcode/w-transcode-1.0.1/fake-i386//usr/local/lib/transcode/export_net.so"
 
does not exist
Error in package: 
"/usr/ports/multimedia/transcode/w-transcode-1.0.1/fake-i386//usr/local/lib/transcode/import_net.so"
 
does not exist
===>  Cleaning for transcode-1.0.1
rm -f /usr/ports/packages/i386/all/transcode-1.0.1.tgz
*** Error code 1

Stop in /usr/ports/multimedia/transcode (line 2016 
of /usr/ports/infrastructure/mk/bsd.port.mk).
*** Error code 1

Stop in /usr/ports/multimedia/transcode (line 1252 
of /usr/ports/infrastructure/mk/bsd.port.mk).

Hope I didn't do anything stupid.

Regards,
Stephan



update: multimedia/transcode

2005-10-10 Thread Jacob Meuser
attached is a patch to update multimedia/transcode to the 1.0.1 release.

transcode changes (annoted):
- lots of bug fixes and code cleanup
- i386 nasm code replaced
- several speed improvements
- uses external libmpeg2
- new filters: facemask, ascii
- can read raw DVD ISO images
- new export profile: xvcd
- auto-probe support for bktr and sunau
- safer sting functions
- much improved amd64 support
- removed local copies of bbmpeg, libdvenc and libpostproc
- uses an external libpostproc

port changes:
- most patches integrated
- USE_LIBTOOL
- update my address


I also have updates for libquicktime and mjpegtools, but transcode
should be updated first to avoid breakage.

-- 
<[EMAIL PROTECTED]>
diff -uNr --exclude=CVS /usr/ports/multimedia/transcode/Makefile 
transcode/Makefile
--- /usr/ports/multimedia/transcode/MakefileSun Oct  9 15:01:46 2005
+++ transcode/Makefile  Sun Oct  9 15:10:38 2005
@@ -2,24 +2,24 @@
 
 COMMENT=   "video stream processing tools"
 
-DISTNAME=  transcode-0.6.14
-PKGNAME=   ${DISTNAME}p2
+DISTNAME=  transcode-1.0.1
 CATEGORIES=multimedia
 
 HOMEPAGE=  http://www.transcoding.org/
 
-MAINTAINER=Jacob Meuser <[EMAIL PROTECTED]>
+MAINTAINER=Jacob Meuser <[EMAIL PROTECTED]>
 
 # GPL
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
-WANTLIB=   ICE SM X11 Xext Xv c freetype m pthread \
-   usbhid vorbisenc z
+WANTLIB=   ICE SM X11 Xaw Xext Xi Xpm Xt Xv c freetype \
+   m pthread usbhid vorbisenc z \
+   glib gmodule intl
 
 MASTER_SITES=  http://www.jakemsr.com/transcode/ \
-   http://dl.fkb.wormulon.net/transcode/
+   http://kraymer.de/mirroring/
 
 FLAVORS=   lzo mjpegtools quicktime
 FLAVOR?=
@@ -27,7 +27,6 @@
 BUILD_DEPENDS+=::devel/pkgconfig
 
 .if ${MACHINE_ARCH} == "i386"
-BUILD_DEPENDS+=::devel/nasm
 PKG_ARGS+= -Di386=1
 .else
 PKG_ARGS+= -Di386=0
@@ -36,15 +35,19 @@
 PATCH_LIST=patch-* gcc-*
 .endif
 
-LIB_DEPENDS=   SDL.2::devel/sdl \
+LIB_DEPENDS=   SDL.2::devel/sdl \
a52.0::audio/liba52 \
-   avcodec.4.9::graphics/ffmpeg \
+   avcodec.6::graphics/ffmpeg \
dv.4::multimedia/libdv \
dvdread.3::devel/libdvdread \
+   gdk.1.2,gtk.1.2::x11/gtk+ \
iconv.4::converters/libiconv \
jpeg.62::graphics/jpeg \
mp3lame.0::audio/lame \
+   mpeg2.0,mpeg2convert.0::graphics/libmpeg2 \
ogg.5::audio/libogg \
+   postproc.6::graphics/ffmpeg \
+   theora.1::multimedia/libtheora \
vorbis.3,vorbisfile.4::audio/libvorbis \
xml2.8::textproc/libxml
 
@@ -57,30 +60,35 @@
 
 SEPARATE_BUILD=concurrent
 
+USE_LIBTOOL=   Yes
 SHARED_ONLY=   Yes
 CONFIGURE_STYLE=   gnu
 CONFIGURE_ENV+=CPPFLAGS="-I${LOCALBASE}/include 
-I${X11BASE}/include" \
-   LDFLAGS="-L${LOCALBASE}/lib" \
-   FFMPEG_LIBS_EXTRALIBS="-lmp3lame -la52 -lvorbisenc 
-lvorbis -logg"
+   LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
+   LIBAVCODEC_EXTRA_LIBS="-lmp3lame -la52 -lvorbisenc 
-lvorbis -logg"
 
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/autotools
 
 CONFIGURE_ARGS+=   ${CONFIGURE_SHARED} \
+   --enable-statbuffer \
--enable-a52 \
--enable-a52-default-decoder \
--enable-bktr \
+   --enable-freetype2 \
+   --enable-gtk \
+   --enable-lame \
--enable-libdv \
+   --enable-libdvdread \
+   --enable-libiconv \
+   --enable-libjpeg \
+   --enable-libpostproc \
--enable-libxml2 \
--enable-ogg \
--enable-sdl \
--enable-sunau \
+   --enable-theora \
--enable-vorbis \
-   --enable-ffbin \
-   --disable-3dnow \
-   --disable-sse \
-   --disable-sse2 \
-   --disable-cmov \
-   --disable-altivec
+   
--with-libpostproc-includes="${LOCALBASE}/include/postproc"
 
 .if ${