pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/multimedia/avidemux Update to 2.4.1.

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1708beec7db5
branches:  trunk
changeset: 538766:1708beec7db5
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Tue Feb 19 09:11:43 2008 +0000

description:
Update to 2.4.1.

A short changelog compared to 2.3:

* Input and output support for MKV and FLV containers
* Rewritten MP4/MOV/3GP reader
* Support for Nellymoser codec
* New DV video output support
* New MPEG-TS support including H.264 Elementary Stream
* OCR support for MPEG-TS subtitles
* New video bitstream unpacker (improved compatibility)
* Capability to pack video bitstreams
* New Yadif filter (ported from Avisynth)
* Video filters can be loaded as external plug-ins (sample plug-in included)
* Three interfaces now offered: command line, GTK+ and Qt4 (Qt4 is still incomplete)
* Several key dialogs have been revamped (GTK+ user interface only)
* Preview system refactored
* Priority control added for encoding and video playback (Win32 only)
* New Jog Shuttle control (GTK+ user interface only)
* Support for Jog Shuttle hardware (Linux & GTK+ only)
* New iPod and PlayStation Portable profiles
* New Glyph Editor
* Improved Bitrate Histogram
* JACK support (Linux only)
* DirectX support (Win32 only)
* New Avisynth Proxy GUI (Win32 only)
* Improved crash recovery - session settings are saved and reloaded upon
  application start
* Numerous bugs fixed

...and more, see the changelog for more info.

diffstat:

 multimedia/avidemux/Makefile         |  60 +++----------------------
 multimedia/avidemux/PLIST            |  17 ++++++-
 multimedia/avidemux/distinfo         |  23 +++++----
 multimedia/avidemux/patches/patch-aa |  21 +++-----
 multimedia/avidemux/patches/patch-ab |  14 +++---
 multimedia/avidemux/patches/patch-ac |  42 ------------------
 multimedia/avidemux/patches/patch-ad |  22 ---------
 multimedia/avidemux/patches/patch-ae |  15 ------
 multimedia/avidemux/patches/patch-af |  82 ------------------------------------
 multimedia/avidemux/patches/patch-as |  13 +++++
 multimedia/avidemux/patches/patch-at |  15 ++++++
 multimedia/avidemux/patches/patch-au |  13 +++++
 multimedia/avidemux/patches/patch-av |  13 +++++
 multimedia/avidemux/patches/patch-aw |  13 +++++
 multimedia/avidemux/patches/patch-ax |  46 ++++++++++++++++++++
 multimedia/avidemux/patches/patch-ay |  21 +++++++++
 16 files changed, 185 insertions(+), 245 deletions(-)

diffs (truncated from 542 to 300 lines):

diff -r 2a25f37a173a -r 1708beec7db5 multimedia/avidemux/Makefile
--- a/multimedia/avidemux/Makefile      Tue Feb 19 03:56:08 2008 +0000
+++ b/multimedia/avidemux/Makefile      Tue Feb 19 09:11:43 2008 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.44 2007/12/28 12:15:38 joerg Exp $
+# $NetBSD: Makefile,v 1.45 2008/02/19 09:11:43 xtraeme Exp $
 #
 
-DISTNAME=      avidemux_2.3.0
+DISTNAME=      avidemux_2.4.1
 PKGNAME=       ${DISTNAME:S/_/-/}
-PKGREVISION=   1
+#PKGREVISION=  1
 CATEGORIES=    multimedia
 MASTER_SITES=  http://download.berlios.de/avidemux/
 
@@ -14,65 +14,20 @@
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 GCC_REQD+=             3.0
-GNU_CONFIGURE=         yes
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            gmake perl pkg-config msgfmt
+USE_TOOLS+=            cmake pkg-config msgfmt
+USE_CMAKE=             yes
 
 CPPFLAGS+=             -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
 LIBS+=                 ${LIBOSSAUDIO}
 
-CONFIGURE_ENV+=                X11_LDFLAGS=${X11_LDFLAGS:Q}
-CONFIGURE_ENV+=                ac_cv_path_ART_CONFIG=no
-CONFIGURE_ARGS+=       \
-       --with-jsapi-include=${BUILDLINK_PREFIX.spidermonkey}/include
-
-.include "../../mk/bsd.prefs.mk"
-
-PKG_OPTIONS_VAR=       PKG_OPTIONS.avidemux
-PKG_SUPPORTED_OPTIONS= faad
-.if ${MACHINE_ARCH} == "i386"
-PKG_SUPPORTED_OPTIONS+=        mmx
-.endif
-
-.if ${OPSYS} == "Darwin"
-CPPFLAGS+=             -D__maxosx__
-
-.if ${MACHINE_ARCH} == "powerpc"
-CONFIGURE_ARGS+=       --enable-altivec
-CONFIGURE_ENV+=                CCAS=${CC}
-.endif
-.endif
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mfaad)
-.  include "../../audio/faad2/buildlink3.mk"
-CPPFLAGS+=             -I${BUILDLINK_PREFIX.faad2}/include/faad2
-CONFIGURE_ARGS+=       --with-faad2
-RESTRICTED=            Dolby doesn't allow binary distributions (FAAD)
-NO_BIN_ON_FTP=         ${RESTRICTED}
-NO_BIN_ON_CDROM=       ${RESTRICTED}
-.else
-CONFIGURE_ARGS+=       --without-newfaad
-CONFIGURE_ARGS+=       --disable-faad
-.endif
-
-.if empty(PKG_OPTIONS:Mmmx)
-CONFIGURE_ARGS+=       --disable-mmx
-
-post-configure:
-       ${MV} ${WRKSRC}/avidemux/ADM_lavcodec/config.mak \
-               ${WRKSRC}/avidemux/ADM_lavcodec/config.mak.in
-       ${SED} -e 's/TARGET_MMX=yes/TARGET_MMX=no/g' \
-               < ${WRKSRC}/avidemux/ADM_lavcodec/config.mak.in \
-               > ${WRKSRC}/avidemux/ADM_lavcodec/config.mak
-.endif
-
 .include "../../audio/faac/buildlink3.mk"
+.include "../../audio/faad2/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
 .include "../../audio/liba52/buildlink3.mk"
+.include "../../audio/libsamplerate/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
@@ -83,6 +38,7 @@
 .include "../../multimedia/x264-devel/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXv/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2a25f37a173a -r 1708beec7db5 multimedia/avidemux/PLIST
--- a/multimedia/avidemux/PLIST Tue Feb 19 03:56:08 2008 +0000
+++ b/multimedia/avidemux/PLIST Tue Feb 19 09:11:43 2008 +0000
@@ -1,7 +1,20 @@
-@comment $NetBSD: PLIST,v 1.5 2007/08/28 18:50:00 jlam Exp $
-bin/avidemux2
+@comment $NetBSD: PLIST,v 1.6 2008/02/19 09:11:43 xtraeme Exp $
+bin/avidemux2_cli
+bin/avidemux2_gtk
+share/locale/ca/LC_MESSAGES/avidemux.mo
 share/locale/cs/LC_MESSAGES/avidemux.mo
+share/locale/de/LC_MESSAGES/avidemux.mo
+share/locale/el/LC_MESSAGES/avidemux.mo
 share/locale/es/LC_MESSAGES/avidemux.mo
 share/locale/fr/LC_MESSAGES/avidemux.mo
+share/locale/it/LC_MESSAGES/avidemux.mo
+share/locale/ja/LC_MESSAGES/avidemux.mo
 share/locale/klingon/LC_MESSAGES/avidemux.mo
+share/locale/pt_BR/LC_MESSAGES/avidemux.mo
 share/locale/ru/LC_MESSAGES/avidemux.mo
+share/locale/sr/LC_MESSAGES/avidemux.mo
+share/locale/sr@latin/LC_MESSAGES/avidemux.mo
+share/locale/tr/LC_MESSAGES/avidemux.mo
+@dirrm share/locale/sr@latin/LC_MESSAGES
+@dirrm share/locale/sr@latin
+@dirrm share/locale/klingon/LC_MESSAGES
diff -r 2a25f37a173a -r 1708beec7db5 multimedia/avidemux/distinfo
--- a/multimedia/avidemux/distinfo      Tue Feb 19 03:56:08 2008 +0000
+++ b/multimedia/avidemux/distinfo      Tue Feb 19 09:11:43 2008 +0000
@@ -1,11 +1,14 @@
-$NetBSD: distinfo,v 1.13 2008/01/05 21:14:10 tron Exp $
+$NetBSD: distinfo,v 1.14 2008/02/19 09:11:43 xtraeme Exp $
 
-SHA1 (avidemux_2.3.0.tar.gz) = 40a51db22593d910224dac91b512489a6af499fb
-RMD160 (avidemux_2.3.0.tar.gz) = 1e10183d4b80104a42d40bfd9d9e9b5c54843d9e
-Size (avidemux_2.3.0.tar.gz) = 4750919 bytes
-SHA1 (patch-aa) = c032d5bfe7641b89ee5f0adb65e75f1b0b31035e
-SHA1 (patch-ab) = f6e79bf9dfbae621c6fd07499ff74bfd14a57150
-SHA1 (patch-ac) = 7872afd5a1eebd6bd57de65a1cfac1ac4e3149ee
-SHA1 (patch-ad) = 3a0b32c90471d4589f50afca9495eff2b2b74fcb
-SHA1 (patch-ae) = 275ffd524e25fd9f3d3f27b503eb092857a6045a
-SHA1 (patch-af) = afa0e400f628aae53087307894979b3278eca87b
+SHA1 (avidemux_2.4.1.tar.gz) = 6bbf542bab73d91cb73f198d2d8afe10d83b2821
+RMD160 (avidemux_2.4.1.tar.gz) = 8149eb62cb4f3196d98b8c2707a4252f06e198cf
+Size (avidemux_2.4.1.tar.gz) = 5788014 bytes
+SHA1 (patch-aa) = eeee381ed62b8a2c81963f5e5d6adbf69acdf642
+SHA1 (patch-ab) = 1b9fc51354c60584205b23f6d6425e09074f6303
+SHA1 (patch-as) = 9d8edeac752b0e08cec7b37e9357ec49d259b5d6
+SHA1 (patch-at) = 3b31ca6eaddbaffa37d05eee1f889b2d8b73407b
+SHA1 (patch-au) = 98fd766da4424cfd183e4a4b4e1892f2ab17c491
+SHA1 (patch-av) = 68e40fff1eaa735b9ac36556f308ed9a45316911
+SHA1 (patch-aw) = 2f89f7d2beb7863a831bb7ae6e539ecc2cadcb21
+SHA1 (patch-ax) = 42b2d2bbc57a6979fd0858a1eef671545682276b
+SHA1 (patch-ay) = 7bfde827e20a9546d9a533293e6d9519b166bb95
diff -r 2a25f37a173a -r 1708beec7db5 multimedia/avidemux/patches/patch-aa
--- a/multimedia/avidemux/patches/patch-aa      Tue Feb 19 03:56:08 2008 +0000
+++ b/multimedia/avidemux/patches/patch-aa      Tue Feb 19 09:11:43 2008 +0000
@@ -1,17 +1,12 @@
-$NetBSD: patch-aa,v 1.5 2006/12/08 22:06:28 joerg Exp $
+$NetBSD: patch-aa,v 1.6 2008/02/19 09:11:43 xtraeme Exp $
 
---- avidemux/ADM_audiodevice/ADM_deviceoss.cpp.orig    2006-12-03 11:13:13.000000000 +0100
-+++ avidemux/ADM_audiodevice/ADM_deviceoss.cpp 2006-12-03 11:13:48.000000000 +0100
-@@ -26,9 +26,10 @@
- #include <fcntl.h>
- #include <sys/ioctl.h>
- 
--#if defined(ADM_BSD_FAMILY) && !defined(__FreeBSD__)
-+#if defined(ADM_BSD_FAMILY) && !defined(__FreeBSD__) && !defined(__DragonFly__)
+--- avidemux/ADM_audiodevice/ADM_deviceoss.cpp.orig    2008-02-18 21:20:28.000000000 +0100
++++ avidemux/ADM_audiodevice/ADM_deviceoss.cpp 2008-02-18 21:21:09.000000000 +0100
+@@ -29,6 +29,7 @@
+ #if defined(ADM_BSD_FAMILY) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
        #include <soundcard.h>
--      const char *dsp = DEVOSSAUDIO;;
-+      const char *dsp = DEVOSSAUDIO;
+       const char *dsp = DEVOSSAUDIO;;
 +      const char *device_mixer = "/dev/mixer";
  
- #else
-       #include <sys/soundcard.h>
+ #elif defined(__OpenBSD__)
+       #include <soundcard.h>
diff -r 2a25f37a173a -r 1708beec7db5 multimedia/avidemux/patches/patch-ab
--- a/multimedia/avidemux/patches/patch-ab      Tue Feb 19 03:56:08 2008 +0000
+++ b/multimedia/avidemux/patches/patch-ab      Tue Feb 19 09:11:43 2008 +0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-ab,v 1.5 2006/12/08 22:06:28 joerg Exp $
+$NetBSD: patch-ab,v 1.6 2008/02/19 09:11:43 xtraeme Exp $
 
---- avidemux/ADM_script/ADM_JSFunctions.cpp.orig       2006-12-03 11:19:32.000000000 +0100
-+++ avidemux/ADM_script/ADM_JSFunctions.cpp    2006-12-03 11:20:16.000000000 +0100
-@@ -325,7 +325,9 @@ JSBool systemExecute(JSContext *cx, JSOb
+--- avidemux/ADM_script/ADM_JSFunctions.cpp.orig       2008-02-18 21:17:52.000000000 +0100
++++ avidemux/ADM_script/ADM_JSFunctions.cpp    2008-02-18 21:18:36.000000000 +0100
+@@ -375,7 +375,9 @@
        // clear file descriptor table of forked process and fork
- #if defined( __linux__) || defined(__maxosx__)
+ #if defined( __linux__) || defined(__macosx__) || defined(__APPLE__)
        pid_t pidRtn = fork();
--#elif __FreeBSD__
+-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
 +#elif defined(__NetBSD__)
 +      pid_t pidRtn = vfork();
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
        pid_t pidRtn = rfork(RFPROC|RFCFDG);
  #endif
        if(pidRtn == 0)
diff -r 2a25f37a173a -r 1708beec7db5 multimedia/avidemux/patches/patch-ac
--- a/multimedia/avidemux/patches/patch-ac      Tue Feb 19 03:56:08 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/12/05 14:26:28 tron Exp $
-
---- avidemux/ADM_script/DirectorySearch.h.orig 2006-10-08 15:40:42.000000000 +0100
-+++ avidemux/ADM_script/DirectorySearch.h      2006-12-05 13:58:39.000000000 +0000
-@@ -14,7 +14,9 @@
- #if _MSC_VER > 1000
- #pragma once
- #endif // _MSC_VER > 1000
--#if !defined( __unix__) && !defined(__maxosx__)
-+#include <sys/types.h>
-+#include <sys/param.h>
-+#if !defined(BSD) && !defined( __unix__) && !defined(__macosx__)
- #include <io.h>
- #else
- #include <sys/types.h>
-@@ -26,7 +28,7 @@
- // create a non file bit for unix
- #define _A_NONFILE    0x03
- 
--#if defined( __unix__) && !defined(__maxosx__)
-+#if (defined(__unix__) || defined(BSD)) && !defined(__macosx__)
- 
- // wrap the file mode bits
- #define _A_NORMAL     0x00
-@@ -50,6 +52,7 @@
- 
- class CDirectorySearch
- {
-+private:
- public:
-       const char * GetExtension();
-       bool IsExtension(const char *pExtension);
-@@ -102,8 +105,7 @@
-       long m_hSearch;
-       _finddata_t m_fdData;
-       std::string m_sDirectory;
--private:
--#ifdef __unix__
-+#if defined(__unix__) || defined(BSD)
-       // prototypes
-       int _findfirst(const char *path,_finddata_t *pfdData);
-       int _findnext(unsigned long int hDir,_finddata_t *pfdData);
diff -r 2a25f37a173a -r 1708beec7db5 multimedia/avidemux/patches/patch-ad
--- a/multimedia/avidemux/patches/patch-ad      Tue Feb 19 03:56:08 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/12/05 14:26:28 tron Exp $
-
---- avidemux/ADM_script/DirectorySearch.cpp.orig       2006-10-08 15:40:42.000000000 +0100
-+++ avidemux/ADM_script/DirectorySearch.cpp    2006-12-05 14:05:00.000000000 +0000
-@@ -14,7 +14,7 @@
- // Construction/Destruction
- //////////////////////////////////////////////////////////////////////
- 
--#ifdef __unix__
-+#if defined(__unix__) || defined(BSD)
- int CDirectorySearch::_findnext(unsigned long int hDir,_finddata_t *pfdData)
- {// begin _findnext
-       if(!hDir || hDir == 0xFFFFFFFF)
-@@ -29,7 +29,7 @@
-       strncpy(pfdData->name,pEntry->d_name,pEntry->d_reclen);
-       // append NULL terminator
-       pfdData->name[pEntry->d_reclen] = '\0';
--#elif __FreeBSD__
-+#elif defined(__FreeBSD__) || defined(__NetBSD__)
-       strncpy(pfdData->name,pEntry->d_name,pEntry->d_namlen);
-       // append NULL terminator
-       pfdData->name[pEntry->d_namlen] = '\0';
diff -r 2a25f37a173a -r 1708beec7db5 multimedia/avidemux/patches/patch-ae
--- a/multimedia/avidemux/patches/patch-ae      Tue Feb 19 03:56:08 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2006/12/05 18:31:07 tron Exp $
-
---- avidemux/ADM_lavutil/common.h.orig 2005-12-31 14:36:45.000000000 +0000
-+++ avidemux/ADM_lavutil/common.h      2006-10-23 15:39:26.000000000 +0100
-@@ -65,6 +65,10 @@
- #    define restrict
- #endif
- 
-+#if defined(__APPLE__) && defined(__MACH__)
-+#include <math.h>
-+#endif
-+
- #ifndef always_inline
- #if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
- #    define always_inline __attribute__((always_inline)) inline
diff -r 2a25f37a173a -r 1708beec7db5 multimedia/avidemux/patches/patch-af
--- a/multimedia/avidemux/patches/patch-af      Tue Feb 19 03:56:08 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-$NetBSD: patch-af,v 1.2 2008/01/05 21:14:10 tron Exp $
-
Home | Main Index | Thread Index | Old Index