From amistry@am-productions.biz  Mon Apr 21 13:47:57 2003
Return-Path: <amistry@am-productions.biz>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DACCD37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 21 Apr 2003 13:47:57 -0700 (PDT)
Received: from www.am-productions.biz (nr4-216-196-155-103.fuse.net [216.196.155.103])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5776B43FBF
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 21 Apr 2003 13:47:55 -0700 (PDT)
	(envelope-from amistry@am-productions.biz)
Received: from www.am-productions.biz (nr4-216-196-155-103.fuse.net [216.196.155.103])
	by www.am-productions.biz (8.12.6p2/8.12.3) with ESMTP id h3LL4pIp083460
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 21 Apr 2003 17:04:52 -0400 (EDT)
	(envelope-from amistry@am-productions.biz)
Received: (from amistry@localhost)
	by www.am-productions.biz (8.12.6p2/8.12.3/Submit) id h3LL4pxH083459;
	Mon, 21 Apr 2003 17:04:51 -0400 (EDT)
Message-Id: <200304212104.h3LL4pxH083459@www.am-productions.biz>
Date: Mon, 21 Apr 2003 17:04:51 -0400 (EDT)
From: Anish Mistry <amistry@am-productions.biz>
Reply-To: Anish Mistry <amistry@am-productions.biz>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Avidemux port update to 0.9 Supersedes ports/51012 and ports/51220
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         51251
>Category:       ports
>Synopsis:       Avidemux port update to 0.9 Supersedes ports/51012 and ports/51220
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 21 13:50:15 PDT 2003
>Closed-Date:    Sat May 10 15:43:13 PDT 2003
>Last-Modified:  Sat May 10 15:43:13 PDT 2003
>Originator:     Anish Mistry
>Release:        FreeBSD 4.8-RELEASE
>Organization:
AM Productions
>Environment:
System: FreeBSD bigguy.am-productions.biz 4.8-RELEASE FreeBSD 4.8-RELEASE #6: Sun Apr 20 23:31:37 EDT 2003     amistry@bigguy.am-productions.biz:/usr/obj/usr/src/sys/BIGGUY  i386

	
>Description:
	Update to Avidemux 0.9.  Supersedes ports/51012 and ports/51220
>How-To-Repeat:
	
>Fix:

	

--- avidemux-0.9.patch begins here ---
diff -ruN avidemux.orig/Makefile avidemux/Makefile
--- avidemux.orig/Makefile	Thu Apr  3 20:38:36 2003
+++ avidemux/Makefile	Mon Apr 21 16:27:01 2003
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	avidemux
-PORTVERSION=	0.9.0.101
+PORTVERSION=	0.9.0.110
 CATEGORIES=	multimedia
 MASTER_SITES=	http://fixounet.free.fr/avidemux/
-DISTNAME=	avidemux-0.9rc1
+DISTNAME=	avidemux-0.9
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	amistry@am-productions.biz
-COMMENT=	GUI based AVI (DivX) editor
+COMMENT=	Simple GUI based video editor
 
 LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
 		mad.1:${PORTSDIR}/audio/mad \
@@ -63,7 +63,6 @@
 post-patch:
 	@${TOUCH} ${WRKSRC}/*
 	@${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-
 post-configure:
 	@${SH} ${WRKSRC}/buildLavCodec.sh
 
diff -ruN avidemux.orig/distinfo avidemux/distinfo
--- avidemux.orig/distinfo	Mon Mar 31 02:51:10 2003
+++ avidemux/distinfo	Mon Apr 21 16:27:39 2003
@@ -1 +1 @@
-MD5 (avidemux-0.9rc1.tgz) = 890a7b4b80127981d0afa7d13be6f314
+MD5 (avidemux-0.9.tgz) = ccadde58eb5f00473d7c2ee5d04bca51
diff -ruN avidemux.orig/pkg-comment avidemux/pkg-comment
--- avidemux.orig/pkg-comment	Wed Dec 31 19:00:00 1969
+++ avidemux/pkg-comment	Mon Apr 21 16:34:20 2003
@@ -0,0 +1 @@
+Simple GUI based video editor
diff -ruN avidemux.orig/pkg-descr avidemux/pkg-descr
--- avidemux.orig/pkg-descr	Wed Aug 28 04:44:32 2002
+++ avidemux/pkg-descr	Mon Apr 21 16:33:04 2003
@@ -1,6 +1,6 @@
-An AVI (DivX) editor that is built around Xvid and divx4linux.  Contains
-various filters for deinterlacing, cropping, resizing, etc.  Allows for
-cutting without re-encoding.  Has the ability to re-encode and re-sample.
+A simple GUI based video editor that is built around Xvid and lavcodec. 
+Contains various filters for deinterlacing, cropping, resizing, etc.  Allows
+for cutting without re-encoding.  Has the ability to re-encode and re-sample.
 
 WWW: http://fixounet.free.fr/avidemux/
 
diff -ruN avidemux.orig/pkg-message avidemux/pkg-message
--- avidemux.orig/pkg-message	Wed Aug 28 04:44:32 2002
+++ avidemux/pkg-message	Mon Apr 21 16:34:49 2003
@@ -1,3 +1,3 @@
 Remove any encore2.h, encore.h, and decore.h that you may have moved to the
-/usr/local/include directory since it may cause the built program to crash
+${PREFIX}/include directory since it may cause the built program to crash
 when opening a file.  
--- avidemux-0.9.patch ends here ---


>Release-Note:
>Audit-Trail:

From: Ulrich Spoerlein <q@uni.de>
To: Anish Mistry <amistry@am-productions.biz>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/51251: Avidemux port update to 0.9 Supersedes ports/51012 and ports/51220
Date: Thu, 24 Apr 2003 21:15:25 +0200

 Won't built for me on my -STABLE System:
 
 [...]
 /bin/sh ../libtool --silent --mode=link c++  -I.. -IADM_library
 -I../ADM_library  -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -O -O2 -O
 -pipe -fno-exceptions -fno-check-new   -L/usr/local/lib -L/usr/X11R6/lib
 -o avidemux  -L/usr/X11R6/lib  -L/usr/X11R6/lib -L/usr/X11R6/lib -lgtk12
 -lgdk12 -L/usr/local/lib -Wl,-E -lgmodule12 -lglib12 -lintl -lXi -lXext
 -lX11 -lm -L/usr/local/lib -lfreetype  -L/usr/local/lib -lxml2 -lz
 -L/usr/local/lib -liconv -lm -L/usr/local/lib
 ../adm_lavcodec/libavcodec.a gui_keyframes.o support.o guiplay.o
 gui_xv.o gui_savenew.o gui_rgb.o gui_render.o gui_navigate.o gtk_gui.o
 callbacks.o avilist.o main.o prefs.o
 ./ADM_mpPostProc/libADM_mpPostProc.a ./ADM_editor/libADM_editor.a
 ./ADM_library/libADM_library.a ./ADM_audiocodec/libADM_audiocodec.a
 ./ADM_audio/libADM_audio.a ./oplug_avi/liboplug_avi.a
 ./ADM_filter/libADM_filter.a ./ADM_video/libADM_video.a
 ./ADM_encoder/libADM_encoder.a  ./ADM_codecs/libADM_codecs.a
 ./ADM_vp32/libADM_vp32.a   ./ADM_audiofilter/libADM_audiofilter.a
 ./oplug_mpegFF/liboplug_mpegFF.a  ./oplug_mpeg/liboplug_mpeg.a
 ./ADM_gui/libADM_gui.a ./ADM_inpics/libADM_inpics.a
 ./ADM_h263/libADM_h263.a   ./ADM_nuv/libADM_nuv.a
 ./ADM_colorspace/libADM_colorspace.a
 ./ADM_audiodevice/libADM_audiodevice.a ./ADM_toolkit/libADM_toolkit.a
 ./ADM_mpeg2dec/libADM_mpeg2dec.a ./ADM_mpegindexer/libADM_mpegindexer.a
 ./libMpeg2Dec/liblibMpeg2Dec.a   ./ADM_mpPostProc/libADM_mpPostProc.a
 -lXv -llavjpeg -lmjpegutils -lmp3lame -lvorbis -la52 -lmad -lxvidcore
 -ldivxdecore -pthread 
 libtool: link: cannot find the library `'
 gmake[3]: *** [avidemux] Error 1
 gmake[3]: Leaving directory
 `/usr/tmp/usr/ports/multimedia/avidemux/work/avidemux-0.9/avidemux'
 gmake[2]: *** [all-recursive] Error 1
 gmake[2]: Leaving directory
 `/usr/tmp/usr/ports/multimedia/avidemux/work/avidemux-0.9/avidemux'
 gmake[1]: *** [all-recursive] Error 1
 gmake[1]: Leaving directory
 `/usr/tmp/usr/ports/multimedia/avidemux/work/avidemux-0.9'
 gmake: *** [all] Error 2
 *** Error code 2
 
 Stop in /usr/ports/multimedia/avidemux.

From: Ulrich Spoerlein <q@uni.de>
To: Anish Mistry <amistry@am-productions.biz>
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/51251: Avidemux port update to 0.9 Supersedes ports/51012 and ports/51220
Date: Sun, 27 Apr 2003 21:35:14 +0200

 Well, I don't know why, but after rebuilding _every_ library avidemux
 wants to link against and running ldconfig, it finally built.
 Nevertheless I had to remove an inclusion of stdint.h (not existant on
 -STABLE), but I don't know if it is required for -CURRENT, please test.
 
 
 --- avidemux/ADM_h263/ADM_mp4.cpp.orig	Sun Apr 27 21:07:08 2003
 +++ avidemux/ADM_h263/ADM_mp4.cpp	Sun Apr 27 21:07:16 2003
 @@ -14,7 +14,6 @@
   */
  #include <stdio.h>
  #include <stdlib.h>
 -#include <stdint.h>
  #include <string.h>
  #include <assert.h>
  #include <math.h>

From: Anish Mistry <amistry@am-productions.biz>
To: <FreeBSD-gnats-submit@FreeBSD.org>
Cc:  
Subject: Re: ports/51251: Avidemux port update to 0.9 Supersedes ports/51012
 and ports/51220
Date: Sun, 27 Apr 2003 18:39:15 -0400 (EDT)

 :).  Ok, we're good to go.
 
 Anish Mistry
 amistry@am-productions.biz
 AM Productions http://am-productions.biz/
 
 On Sun, 27 Apr 2003, Ulrich Spoerlein wrote:
 
 > On Sun, 27.04.2003 at 16:39:24 -0400, Anish Mistry wrote:
 > > Hi,
 > >
 > >    Are you sure you are applying the patch in the PR correctly?  Because
 > > that header part is already changed in the 0.9.  It looks like you are
 > > trying to compile rc1 rather than 0.9.
 >
 > WARGH!
 >
 > 101, 110, what's the difference anyway? :)
 >
 > Sorry for the noise, the newest port compiles fine (and should be
 > committed ASAP :)
 >
 
State-Changed-From-To: open->closed 
State-Changed-By: adamw 
State-Changed-When: Sat May 10 15:40:21 PDT 2003 
State-Changed-Why:  
Committed, thanks! 

I made a couple modifications to the port. xvid and a52 
compilation were nonfunctional, and the post-configure target 
is unnecessary. 

Many users will get an error upon link. Recompiling/reinstalling 
mjpegtools will fix this. Depending on the frequency of people 
complaining about this, it may be necessary to add a disclaimer 
to the build process. 

I'm a bit confused about the email in this PR about stdint.h. 
That library is no longer included in avidemux/ADM_h263/ADM_mp4.cpp. 
*shrug* 

http://www.freebsd.org/cgi/query-pr.cgi?pr=51251 
>Unformatted:
