[pkgsrc/trunk]: pkgsrc/graphics/avidemux Update to 2.0.18

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/10a838cecb2d
branches:  trunk
changeset: 464933:10a838cecb2d
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Thu Dec 18 03:43:30 2003 +0000

description:
Update to 2.0.18

New features were added and many bugfixes were solved. Review Changelog
to see a complete list of changes.

diffstat:

 graphics/avidemux/Makefile         |   5 +--
 graphics/avidemux/distinfo         |  15 +++----------
 graphics/avidemux/patches/patch-aa |  40 ++++++++++---------------------------
 graphics/avidemux/patches/patch-ab |  22 --------------------
 graphics/avidemux/patches/patch-ac |  20 -------------------
 graphics/avidemux/patches/patch-ad |  13 ------------
 graphics/avidemux/patches/patch-ae |  13 ------------
 graphics/avidemux/patches/patch-af |  28 --------------------------
 graphics/avidemux/patches/patch-ag |  13 ------------
 graphics/avidemux/patches/patch-ah |  19 ------------------
 10 files changed, 17 insertions(+), 171 deletions(-)

diffs (262 lines):

diff -r 831965caefe0 -r 10a838cecb2d graphics/avidemux/Makefile
--- a/graphics/avidemux/Makefile        Thu Dec 18 03:37:17 2003 +0000
+++ b/graphics/avidemux/Makefile        Thu Dec 18 03:43:30 2003 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/12/13 00:45:23 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/12/18 03:43:30 xtraeme Exp $
 #
 
-DISTNAME=      avidemux-2.0.10
-PKGREVISION=   3
+DISTNAME=      avidemux-2.0.18
 CATEGORIES=    graphics
 MASTER_SITES=  http://fixounet.free.fr/avidemux/
 
diff -r 831965caefe0 -r 10a838cecb2d graphics/avidemux/distinfo
--- a/graphics/avidemux/distinfo        Thu Dec 18 03:37:17 2003 +0000
+++ b/graphics/avidemux/distinfo        Thu Dec 18 03:43:30 2003 +0000
@@ -1,12 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/08/02 15:51:41 jmmv Exp $
+$NetBSD: distinfo,v 1.2 2003/12/18 03:43:30 xtraeme Exp $
 
-SHA1 (avidemux-2.0.10.tar.gz) = 3adcba00ba9893b9e54fa9da2567810b32013467
-Size (avidemux-2.0.10.tar.gz) = 2014961 bytes
-SHA1 (patch-aa) = 3040be8c6de81c33364a7e5d9c2b8927a271c2b8
-SHA1 (patch-ab) = 366c2e16d14330a7f07afe1681180163e3e8c0a4
-SHA1 (patch-ac) = ae737b39e7976d5f2f66452c6b11d439ad3ea0cf
-SHA1 (patch-ad) = 10a0dfec88c9710cd1e315097c4186d7cc4e9f22
-SHA1 (patch-ae) = 82c5098778474772a3c463294ac74b65bf65d854
-SHA1 (patch-af) = e1b54073ea2e05afceeccdb3e2963b850734a155
-SHA1 (patch-ag) = db6bfd5afd6de6e7290c42431a91b9cdfd965b32
-SHA1 (patch-ah) = 94c28c72afd64f8a909a5826e37bdd49167f70c2
+SHA1 (avidemux-2.0.18.tar.gz) = ce3b6de5bdcade98ea564ec496de4eb370cd5740
+Size (avidemux-2.0.18.tar.gz) = 2518712 bytes
+SHA1 (patch-aa) = 441462c537aa8a2205b6c1d9ab160afc34b5c967
diff -r 831965caefe0 -r 10a838cecb2d graphics/avidemux/patches/patch-aa
--- a/graphics/avidemux/patches/patch-aa        Thu Dec 18 03:37:17 2003 +0000
+++ b/graphics/avidemux/patches/patch-aa        Thu Dec 18 03:43:30 2003 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/08/02 15:51:41 jmmv Exp $
+$NetBSD: patch-aa,v 1.2 2003/12/18 03:43:30 xtraeme Exp $
 
---- configure.orig     2003-07-14 13:07:07.000000000 +0200
-+++ configure
-@@ -18732,6 +18732,7 @@ echo "$as_me: error: *** no pthread foun
+--- configure.orig     2003-12-18 04:24:04.000000000 +0100
++++ configure  2003-12-18 04:25:26.000000000 +0100
+@@ -18902,6 +18902,7 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -10,24 +10,26 @@
  
  echo "$as_me:$LINENO: checking for Divx encode" >&5
  echo $ECHO_N "checking for Divx encode... $ECHO_C" >&6
-@@ -18927,6 +18928,8 @@ if test "x$have_divx" = "xyes"; then
+@@ -19097,7 +19098,8 @@
  echo "$as_me: WARNING: DIVX support removed until it works on p4" >&2;}
  fi
  
+-
 +fi
 +have_divx="no"
  
+ echo "$as_me:$LINENO: checking for xvid codec" >&5
+ echo $ECHO_N "checking for xvid codec... $ECHO_C" >&6
+@@ -19792,7 +19794,7 @@
  
- echo "$as_me:$LINENO: checking for xvid codec" >&5
-@@ -19457,6 +19460,7 @@ _ACEOF
  fi
  
- 
+-
 +if false; then
  
  echo "$as_me:$LINENO: checking for Arts audio support" >&5
  echo $ECHO_N "checking for Arts audio support... $ECHO_C" >&6
-@@ -19669,6 +19673,8 @@ _ACEOF
+@@ -20005,6 +20007,8 @@
          fi
          CPPFLAGS=$old_flags
   fi
@@ -36,23 +38,3 @@
  if test "x$have_arts" = "xno"; then
                ARTS_LIBS=""
        ARTS_CFLAGS=""
-@@ -21357,8 +21364,10 @@ echo $ECHO_N "checking cpu type ... $ECH
- echo $host_cpu
- echo "Machine vendor : $host_vendor"
- use_mmx=1
-+_saved_hv="$host_vendor"
-+if [ -z "$host_vendor" ]; then host_vendor="$host_cpu"; fi
- case $host_vendor in
--      pc)
-+      pc|i386)
-               have_little_endian=yes;
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -21415,6 +21424,7 @@ _ACEOF
- ;;
- esac
- echo "cpu done"
-+host_vendor="$_saved_hv"
- 
- 
- cat >>confdefs.h <<\_ACEOF
diff -r 831965caefe0 -r 10a838cecb2d graphics/avidemux/patches/patch-ab
--- a/graphics/avidemux/patches/patch-ab        Thu Dec 18 03:37:17 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/08/02 15:51:41 jmmv Exp $
-
---- avidemux/ADM_video/ADM_vidFont.cpp.orig    2003-07-09 18:29:23.000000000 +0200
-+++ avidemux/ADM_video/ADM_vidFont.cpp
-@@ -127,7 +127,7 @@ int ADMfont::fontSetCharSet (char *chars
- 
-       sin=1;
-       sout=4;
--#if defined( __FreeBSD__) || defined(ADM_BIG_ENDIAN)
-+#if defined( __FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(ADM_BIG_ENDIAN)
-       sz=iconv(_conv,(const char **)&in,&sin,&out,&sout);
-  #else
-       sz=iconv(_conv,&in,&sin,&out,&sout);
-@@ -184,7 +184,7 @@ size_t sz;
- 
-       sin=1;
-       sout=4;
--#if defined (__FreeBSD__) || defined(ADM_BIG_ENDIAN)
-+#if defined (__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(ADM_BIG_ENDIAN)
-        sz=iconv(_conv,(const char **)&in,&sin,&out,&sout);
- #else
-       sz=iconv(_conv, &in,&sin,&out,&sout);
diff -r 831965caefe0 -r 10a838cecb2d graphics/avidemux/patches/patch-ac
--- a/graphics/avidemux/patches/patch-ac        Thu Dec 18 03:37:17 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2003/08/02 15:51:41 jmmv Exp $
-
---- avidemux/ADM_audiodevice/ADM_deviceoss.cpp.orig    2003-05-12 13:10:29.000000000 +0200
-+++ avidemux/ADM_audiodevice/ADM_deviceoss.cpp
-@@ -29,10 +29,14 @@
- #ifdef OSS_SUPPORT
- #include "ADM_library/default.h"
- #include "audio_out.h"
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
-+#include <soundcard.h>
-+#else
- #include <sys/soundcard.h>
-+#endif
- #include  "ADM_audiodevice/ADM_deviceoss.h"
- 
--const char *dsp = "/dev/dsp";
-+const char *dsp = DEVOSSAUDIO;
- 
- //_______________________________________________
- //
diff -r 831965caefe0 -r 10a838cecb2d graphics/avidemux/patches/patch-ad
--- a/graphics/avidemux/patches/patch-ad        Thu Dec 18 03:37:17 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2003/08/02 15:51:41 jmmv Exp $
-
---- adm_lavcodec/mem.c.orig    2003-05-29 00:40:42.000000000 +0200
-+++ adm_lavcodec/mem.c
-@@ -37,7 +37,7 @@
-       #endif
- #endif
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-       #define memalign(A,B)  malloc(B)
- #endif
- 
diff -r 831965caefe0 -r 10a838cecb2d graphics/avidemux/patches/patch-ae
--- a/graphics/avidemux/patches/patch-ae        Thu Dec 18 03:37:17 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2003/08/02 15:51:41 jmmv Exp $
-
---- avidemux/ADM_video/swscale.h.orig  2003-04-21 01:29:40.000000000 +0200
-+++ avidemux/ADM_video/swscale.h
-@@ -15,7 +15,7 @@
-     along with this program; if not, write to the Free Software
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-        #define memalign(align,size) malloc (size)
- #endif
- 
diff -r 831965caefe0 -r 10a838cecb2d graphics/avidemux/patches/patch-af
--- a/graphics/avidemux/patches/patch-af        Thu Dec 18 03:37:17 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2003/08/02 15:51:41 jmmv Exp $
-
---- adm_lavcodec/dsputil.h.orig        2003-05-29 00:39:00.000000000 +0200
-+++ adm_lavcodec/dsputil.h
-@@ -30,7 +30,7 @@
- #include "common.h"
- #include "avcodec.h"
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
- #define lrintf rintf
- #endif
- 
-@@ -476,6 +476,7 @@ static int name16(void /*MpegEncContext*
-           +name8(s, dst+8+8*stride, src+8+8*stride, stride);\
- }
- 
-+#if 0
- #ifndef HAVE_LRINTF
- /* XXX: add ISOC specific test to avoid specific BSD testing. */
- /* better than nothing implementation. */
-@@ -490,5 +491,6 @@ static inline long int lrintf(float x)
- #endif
- }
- #endif
-+#endif
- 
- #endif
diff -r 831965caefe0 -r 10a838cecb2d graphics/avidemux/patches/patch-ag
--- a/graphics/avidemux/patches/patch-ag        Thu Dec 18 03:37:17 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2003/08/02 15:51:41 jmmv Exp $
-
---- avidemux/ADM_mpPostProc/postprocess.c.orig 2003-07-08 08:25:40.000000000 +0200
-+++ avidemux/ADM_mpPostProc/postprocess.c
-@@ -99,7 +99,7 @@ try to unroll inner for(x=0 ... loop to 
- #define TEMP_STRIDE 8
- /*#define NUM_BLOCKS_AT_ONCE 16 //not used yet */
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-       #define memalign(align,size) malloc (size)
- #endif
- 
diff -r 831965caefe0 -r 10a838cecb2d graphics/avidemux/patches/patch-ah
--- a/graphics/avidemux/patches/patch-ah        Thu Dec 18 03:37:17 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2003/08/02 15:51:41 jmmv Exp $
-
---- adm_lavcodec/Makefile.orig 2003-08-02 17:13:10.000000000 +0200
-+++ adm_lavcodec/Makefile
-@@ -22,12 +22,12 @@ ASM_OBJS=
- 
-       
- # i386 mmx specific stuff
--#ifeq ($(TARGET_MMX),yes)
-+ifeq ($(TARGET_MMX),yes)
- OBJS += i386/fdct_mmx.o i386/cputest.o \
-       i386/dsputil_mmx.o i386/mpegvideo_mmx.o \
-       i386/idct_mmx.o i386/motion_est_mmx.o \
-       i386/simple_idct_mmx.o
--#endif
-+endif
- 
- 
- SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S)