cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to 2.3.0

Browse Source 
- remove SDL dependency

"go ahead" jasper@
This commit is contained in:
ajacoutot 2006-12-06 16:20:30 +00:00
parent c22127d6a0
commit c53e4f1e8e
15 changed files with 139 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
multimedia/avidemux/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.2 2006/10/20 23:35:17 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.3 2006/12/06 16:20:30 ajacoutot Exp $
COMMENT= "free video editor"
DISTNAME= avidemux-2.1.2
PKGNAME= ${DISTNAME}p0
V= 2.3.0
DISTNAME= avidemux_${V}
PKGNAME= avidemux-${V}
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_BERLIOS:=avidemux/}
@ -18,9 +19,9 @@ PERMIT_DISTFILES_CDROM= yes
PERMIT_DISTFILES_FTP= yes
WANTLIB= freetype c stdc++ Xv ossaudio m X11 Xrender pthread \
usbhid Xext fontconfig z pango-1.0 pangocairo-1.0 \
cairo.>=4 atk-1.0 gmodule-2.0 gthread-2.0 glib-2.0 \
pangoft2-1.0 gobject-2.0
Xext fontconfig z pango-1.0 pangocairo-1.0 cairo.>=4 \
atk-1.0 gmodule-2.0 gthread-2.0 glib-2.0 pangoft2-1.0 \
gobject-2.0
MODULES= devel/gettext
@ -29,9 +30,6 @@ LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
vorbis.>=5,vorbisenc.>=2::audio/libvorbis \
mp3lame::audio/lame \
js.>=1::lang/spidermonkey \
a52::audio/liba52 \
mad.>=2::audio/libmad \
SDL.>=6::devel/sdl \
xml2.>=9::textproc/libxml \
xvidcore.>=4::multimedia/xvidcore \
faad::audio/faad \
@ -47,20 +45,21 @@ USE_GCC3= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
-I${LOCALBASE}/include/libpng" \
LDFLAGS="-L${LOCALBASE}/lib -logg"
LDFLAGS="-L${LOCALBASE}/lib -logg" \
PKG_CONFIG=${LOCALBASE}/bin/pkg-config
CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--with-jsapi-include=${LOCALBASE}/include/js \
--enable-xv \
--enable-mad \
--with-libsdl \
--with-freetype2 \
--with-lame \
--with-a52dec \
--with-fontconfig \
--with-oss \
--with-faac \
--with-faad2 \
--without-arts \
--without-esd \
--without-libdca \
--without-libsdl \
--without-newfaad
.include <bsd.port.mk>

8
multimedia/avidemux/distinfo
View File

@ -1,4 +1,4 @@
MD5 (avidemux-2.1.2.tar.gz) = 727214aacdf729506a13d0e0117f01de
RMD160 (avidemux-2.1.2.tar.gz) = beb2f9603fb03a8781387be9fd9547e90ebb1a94
SHA1 (avidemux-2.1.2.tar.gz) = e5b475103f2d19543a0e9d72245252143dc77dd7
SIZE (avidemux-2.1.2.tar.gz) = 3830241
MD5 (avidemux_2.3.0.tar.gz) = 14c58c14fc9757d36e4d72498431da42
RMD160 (avidemux_2.3.0.tar.gz) = 1e10183d4b80104a42d40bfd9d9e9b5c54843d9e
SHA1 (avidemux_2.3.0.tar.gz) = 40a51db22593d910224dac91b512489a6af499fb
SIZE (avidemux_2.3.0.tar.gz) = 4750919

6
multimedia/avidemux/patches/patch-addons_Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-addons_Makefile,v 1.1.1.1 2006/10/19 16:22:06 ajacoutot Exp $
--- addons/Makefile.orig Wed Oct 11 11:23:56 2006
+++ addons/Makefile Wed Oct 11 11:25:05 2006
$OpenBSD: patch-addons_Makefile,v 1.2 2006/12/06 16:20:30 ajacoutot Exp $
--- addons/Makefile.orig Wed Oct 11 14:43:35 2006
+++ addons/Makefile Wed Oct 11 14:43:52 2006
@@ -14,6 +14,8 @@ DISTFILES= Makefile ad2_copy_nuv \
ffv1rec/ffv1video.c \
ffv1rec/ffv1write.c \

24
multimedia/avidemux/patches/patch-adm_lavcodec_Makefile_in
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-adm_lavcodec_Makefile_in,v 1.1.1.1 2006/10/19 16:22:06 ajacoutot Exp $
--- adm_lavcodec/Makefile.in.orig Sun Sep 24 18:34:12 2006
+++ adm_lavcodec/Makefile.in Sun Sep 24 18:34:25 2006
@@ -394,7 +394,7 @@ libavcodec_a_SOURCES = $(EXTEND_PPC) $(E
EXTRA_DIST =
####### kdevelop will overwrite this part!!! (end)############
-INCLUDES = $(all_includes) -I.. -DHAVE_AV_CONFIG_H $(X_MMX_FLAGS) -O3 -Iamr_float -I../avidemux/ADM_lavutil -I$(LAVUTIL)
+INCLUDES = $(all_includes) -I.. -DHAVE_AV_CONFIG_H $(X_MMX_FLAGS) -Iamr_float -I../avidemux/ADM_lavutil -I$(LAVUTIL)
noinst_HEADERS =
all: all-recursive
@@ -1372,9 +1372,9 @@ uninstall-info: uninstall-info-recursive
# for SSE we need special compil flags
fft_sse.o:i386/fft_sse.c
- $(CC) -o $@ $< -c $(CFLAGS) $(all_includes) -I.. -DHAVE_AV_CONFIG_H $(X_MMX_FLAGS) -O3 -msse -I$(LAVUTIL)
+ $(CC) -o $@ $< -c $(CFLAGS) $(all_includes) -I.. -DHAVE_AV_CONFIG_H $(X_MMX_FLAGS) -msse -I$(LAVUTIL)
vp3dsp_sse2.o:i386/vp3dsp_sse2.c
- $(CC) -o $@ $< -c $(CFLAGS) $(all_includes) -I.. -DHAVE_AV_CONFIG_H $(X_MMX_FLAGS) -O3 -msse -I$(LAVUTIL)
+ $(CC) -o $@ $< -c $(CFLAGS) $(all_includes) -I.. -DHAVE_AV_CONFIG_H $(X_MMX_FLAGS) -msse -I$(LAVUTIL)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

8
multimedia/avidemux/patches/patch-avidemux_ADM_audiodevice_ADM_deviceoss_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-avidemux_ADM_audiodevice_ADM_deviceoss_cpp,v 1.1.1.1 2006/10/19 16:22:06 ajacoutot Exp $
--- avidemux/ADM_audiodevice/ADM_deviceoss.cpp.orig Thu Nov 17 22:50:23 2005
+++ avidemux/ADM_audiodevice/ADM_deviceoss.cpp Thu Oct 5 11:14:16 2006
$OpenBSD: patch-avidemux_ADM_audiodevice_ADM_deviceoss_cpp,v 1.2 2006/12/06 16:20:30 ajacoutot Exp $
--- avidemux/ADM_audiodevice/ADM_deviceoss.cpp.orig Thu Oct 5 15:01:34 2006
+++ avidemux/ADM_audiodevice/ADM_deviceoss.cpp Thu Oct 5 15:02:20 2006
@@ -26,9 +26,14 @@
#include <fcntl.h>
#include <sys/ioctl.h>
@ -13,7 +13,7 @@ $OpenBSD: patch-avidemux_ADM_audiodevice_ADM_deviceoss_cpp,v 1.1.1.1 2006/10/19
+#elif defined(__OpenBSD__)
+ #include <soundcard.h>
+ const char *dsp = "/dev/audio";
+ const char *device_mixer = "/dev/mixer";
+ const char *device_mixer = "/dev/mixer";
#else
#include <sys/soundcard.h>

12
multimedia/avidemux/patches/patch-avidemux_ADM_audiofilter_audiodeng_buildfilters_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-avidemux_ADM_audiofilter_audiodeng_buildfilters_cpp,v 1.1 2006/10/20 23:35:17 ajacoutot Exp $
--- avidemux/ADM_audiofilter/audiodeng_buildfilters.cpp.orig Fri Oct 20 20:30:46 2006
+++ avidemux/ADM_audiofilter/audiodeng_buildfilters.cpp Fri Oct 20 20:31:08 2006
@@ -482,7 +482,7 @@ void audioCodecConfigure( void )
}
return;
default:
- ADM_assert(0);
+ ADM_assert(!0);
}

24
multimedia/avidemux/patches/patch-avidemux_ADM_lavcodec_Makefile_in Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-avidemux_ADM_lavcodec_Makefile_in,v 1.1 2006/12/06 16:20:30 ajacoutot Exp $
--- avidemux/ADM_lavcodec/Makefile.in.orig Sat Nov 25 22:02:24 2006
+++ avidemux/ADM_lavcodec/Makefile.in Sat Dec 2 20:08:12 2006
@@ -398,7 +398,7 @@ amr_float i386 libpostproc ppc
####### kdevelop will overwrite this part!!! (end)############
-INCLUDES = $(all_includes) -I.. -DHAVE_AV_CONFIG_H $(X_MMX_FLAGS) -O3 -Iamr_float -I../avidemux/ADM_lavutil -I$(LAVUTIL)
+INCLUDES = $(all_includes) -I.. -DHAVE_AV_CONFIG_H $(X_MMX_FLAGS) -Iamr_float -I../avidemux/ADM_lavutil -I$(LAVUTIL)
noinst_HEADERS =
all: all-recursive
@@ -1240,9 +1240,9 @@ uninstall-info: uninstall-info-recursive
# for SSE we need special compil flags
fft_sse.o:i386/fft_sse.c
- $(CC) -o $@ $< -c $(CFLAGS) $(all_includes) -I.. -DHAVE_AV_CONFIG_H $(X_MMX_FLAGS) -O3 -msse -I$(LAVUTIL) -I../..
+ $(CC) -o $@ $< -c $(CFLAGS) $(all_includes) -I.. -DHAVE_AV_CONFIG_H $(X_MMX_FLAGS) -msse -I$(LAVUTIL) -I../..
vp3dsp_sse2.o:i386/vp3dsp_sse2.c
- $(CC) -o $@ $< -c $(CFLAGS) $(all_includes) -I.. -DHAVE_AV_CONFIG_H $(X_MMX_FLAGS) -O3 -msse -I$(LAVUTIL) -I../..
+ $(CC) -o $@ $< -c $(CFLAGS) $(all_includes) -I.. -DHAVE_AV_CONFIG_H $(X_MMX_FLAGS) -msse -I$(LAVUTIL) -I../..
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

13
multimedia/avidemux/patches/patch-avidemux_ADM_libswscale_yuv2rgb_c Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-avidemux_ADM_libswscale_yuv2rgb_c,v 1.1 2006/12/06 16:20:30 ajacoutot Exp $
--- avidemux/ADM_libswscale/yuv2rgb.c.orig Fri Nov 3 14:51:49 2006
+++ avidemux/ADM_libswscale/yuv2rgb.c Fri Nov 3 14:53:35 2006
@@ -620,6 +620,9 @@ SwsFunc yuv2rgb_get_func_ptr (SwsContext
switch(c->dstFormat){
case PIX_FMT_BGR32:
+#ifdef ADM_BIG_ENDIAN
+ case PIX_FMT_BGRA:
+#endif
case PIX_FMT_RGB32: return yuv2rgb_c_32;
case PIX_FMT_RGB24: return yuv2rgb_c_24_rgb;
case PIX_FMT_BGR24: return yuv2rgb_c_24_bgr;

12
multimedia/avidemux/patches/patch-avidemux_ADM_script_ADM_JSFunctions_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-avidemux_ADM_script_ADM_JSFunctions_cpp,v 1.1 2006/12/06 16:20:30 ajacoutot Exp $
--- avidemux/ADM_script/ADM_JSFunctions.cpp.orig Sun Oct 8 16:40:42 2006
+++ avidemux/ADM_script/ADM_JSFunctions.cpp Sun Dec 3 12:43:38 2006
@@ -325,7 +325,7 @@ JSBool systemExecute(JSContext *cx, JSOb
// clear file descriptor table of forked process and fork
#if defined( __linux__) || defined(__maxosx__)
pid_t pidRtn = fork();
-#elif __FreeBSD__
+#elif defined(__FreeBSD__) || defined(__OpenBSD__)
pid_t pidRtn = rfork(RFPROC|RFCFDG);
#endif
if(pidRtn == 0)

12
multimedia/avidemux/patches/patch-avidemux_ADM_script_DirectorySearch_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-avidemux_ADM_script_DirectorySearch_cpp,v 1.1 2006/12/06 16:20:30 ajacoutot Exp $
--- avidemux/ADM_script/DirectorySearch.cpp.orig Sun Oct 8 16:40:42 2006
+++ avidemux/ADM_script/DirectorySearch.cpp Sun Dec 3 12:42:59 2006
@@ -29,7 +29,7 @@ int CDirectorySearch::_findnext(unsigned
strncpy(pfdData->name,pEntry->d_name,pEntry->d_reclen);
// append NULL terminator
pfdData->name[pEntry->d_reclen] = '\0';
-#elif __FreeBSD__
+#elif defined(__FreeBSD__) || defined(__OpenBSD__)
strncpy(pfdData->name,pEntry->d_name,pEntry->d_namlen);
// append NULL terminator
pfdData->name[pEntry->d_namlen] = '\0';

38
multimedia/avidemux/patches/patch-avidemux_ADM_toolkit_toolkit_cpp
View File

@ -1,38 +0,0 @@
$OpenBSD: patch-avidemux_ADM_toolkit_toolkit_cpp,v 1.1.1.1 2006/10/19 16:22:06 ajacoutot Exp $
--- avidemux/ADM_toolkit/toolkit.cpp.orig Thu Oct 5 09:04:18 2006
+++ avidemux/ADM_toolkit/toolkit.cpp Thu Oct 5 09:05:32 2006
@@ -247,21 +247,21 @@ void UI_purge( void )
}
}
-uint64_t swap64(uint64_t in)
+uint64_t ADM_swap64(uint64_t in)
{
uint32_t low,high;
uint64_t out;
high=in>>32;
low=in&0xffffffff;
- high=swap32(high);
- low=swap32(low);
+ high=ADM_swap32(high);
+ low=ADM_swap32(low);
out=low;
out=(out<<32)+high;
return out;
}
// swap BE/LE : Ugly
-uint32_t swap32( uint32_t in)
+uint32_t ADM_swap32( uint32_t in)
{
uint8_t r[4],u;
memcpy(&r[0],&in,4);
@@ -275,7 +275,7 @@ uint32_t swap32( uint32_t in)
return in;
}
// swap BE/LE : Ugly
-uint16_t swap16( uint16_t in)
+uint16_t ADM_swap16( uint16_t in)
{
return ( (in>>8) & 0xff) + ( (in&0xff)<<8);
}

29
multimedia/avidemux/patches/patch-avidemux_ADM_toolkit_toolkit_hxx
View File

@ -1,29 +0,0 @@
$OpenBSD: patch-avidemux_ADM_toolkit_toolkit_hxx,v 1.1.1.1 2006/10/19 16:22:06 ajacoutot Exp $
--- avidemux/ADM_toolkit/toolkit.hxx.orig Thu Oct 5 09:02:35 2006
+++ avidemux/ADM_toolkit/toolkit.hxx Thu Oct 5 09:04:00 2006
@@ -57,9 +57,9 @@ void ms2time(uint32_t len2,uint16_t *
uint32_t getTimeOfTheDay(void);
/** return 1 if we are in silent mode */
uint8_t isQuiet(void);
-uint64_t swap64(uint64_t in);
-uint32_t swap32(uint32_t in);
-uint16_t swap16(uint16_t in);
+uint64_t ADM_swap64(uint64_t in);
+uint32_t ADM_swap32(uint32_t in);
+uint16_t ADM_swap16(uint16_t in);
inline uint32_t dontswap(uint32_t in) {return in;};
char *ADM_rindex(const char *s, int c);
char *ADM_index(const char *s, int c);
@@ -93,9 +93,9 @@ void GUI_Quiet(void);
uint8_t identMovieType(uint32_t fps1000); // identify the movie type (mainly for mpeg1/2)
uint8_t ms2time(uint32_t ms, uint32_t *h,uint32_t *m, uint32_t *s);
#ifdef ADM_BIG_ENDIAN
- #define R64 swap64
- #define R32 swap32
- #define R16 swap16
+ #define R64 ADM_swap64
+ #define R32 ADM_swap32
+ #define R16 ADM_swap16
#else
#define R64(x) (x)
#define R32(x) (x)

15
multimedia/avidemux/patches/patch-avidemux_MPlayer_pp_yuv2rgb_c
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-avidemux_MPlayer_pp_yuv2rgb_c,v 1.1.1.1 2006/10/19 16:22:06 ajacoutot Exp $
--- avidemux/MPlayer_pp/yuv2rgb.c.orig Thu Oct 5 17:32:42 2006
+++ avidemux/MPlayer_pp/yuv2rgb.c Thu Oct 5 17:32:54 2006
@@ -619,7 +619,10 @@ SwsFunc yuv2rgb_get_func_ptr (SwsContext
MSG_WARN("No accelerated colorspace conversion found\n");
switch(c->dstFormat){
- case IMGFMT_RGB32:
+ case IMGFMT_RGB32:
+#ifdef ADM_BIG_ENDIAN
+ case IMGFMT_BGRA:
+#endif
case IMGFMT_BGR32: return yuv2rgb_c_32;
case IMGFMT_RGB24: return yuv2rgb_c_24_rgb;
case IMGFMT_BGR24: return yuv2rgb_c_24_bgr;

57
multimedia/avidemux/patches/patch-configure
View File

@ -1,7 +1,39 @@
$OpenBSD: patch-configure,v 1.1.1.1 2006/10/19 16:22:06 ajacoutot Exp $
--- configure.orig Wed Mar 1 22:33:47 2006
+++ configure Thu Oct 5 12:32:50 2006
@@ -19142,7 +19142,7 @@ cat confdefs.h >>conftest.$ac_ext
$OpenBSD: patch-configure,v 1.2 2006/12/06 16:20:30 ajacoutot Exp $
--- configure.orig Sat Dec 2 20:09:09 2006
+++ configure Sat Dec 2 20:14:38 2006
@@ -3277,13 +3277,13 @@ if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
elif test $ac_cv_prog_cxx_g = yes; then
if test "$GXX" = yes; then
- CXXFLAGS="-g -O2"
+ CXXFLAGS="-g"
else
CXXFLAGS="-g"
fi
else
if test "$GXX" = yes; then
- CXXFLAGS="-O2"
+ CXXFLAGS=""
else
CXXFLAGS=
fi
@@ -4152,13 +4152,13 @@ if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
if test "$GCC" = yes; then
- CFLAGS="-g -O2"
+ CFLAGS="-g"
else
CFLAGS="-g"
fi
else
if test "$GCC" = yes; then
- CFLAGS="-O2"
+ CFLAGS=""
else
CFLAGS=
fi
@@ -21469,7 +21469,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@ -10,18 +42,23 @@ $OpenBSD: patch-configure,v 1.1.1.1 2006/10/19 16:22:06 ajacoutot Exp $
#include <sys/ioccom.h>
#include <soundcard.h>
#else
@@ -19199,6 +19199,8 @@ cat >>confdefs.h <<\_ACEOF
@@ -21540,6 +21540,8 @@ cat >>confdefs.h <<\_ACEOF
#define OSS_SUPPORT 1
_ACEOF
+ LIBS="-lossaudio $LIBS"
+LIBS="-lossaudio $LIBS"
+
fi
fi
@@ -22849,8 +22851,8 @@ else
CXXFLAGS="$CXXFLAGS -O3"
CFLAGS="$CFLAGS -O3"
@@ -25794,11 +25796,11 @@ _ACEOF
else
if test "x$use_builtin" = "x1"; then
- CXXFLAGS="$CXXFLAGS -O3"
- CFLAGS="$CFLAGS -O3"
+ CXXFLAGS="$CXXFLAGS"
+ CFLAGS="$CFLAGS"
else
- CXXFLAGS="$CXXFLAGS -O2"
- CFLAGS="$CFLAGS -O2"
@ -29,4 +66,4 @@ $OpenBSD: patch-configure,v 1.1.1.1 2006/10/19 16:22:06 ajacoutot Exp $
+ CFLAGS="$CFLAGS"
fi
fi
CFLAGS="$CFLAGS -falign-loops=16"
if test "x$use_gpt" = "x1"; then

9
multimedia/avidemux/pkg/PLIST
View File

@ -1,2 +1,9 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2006/10/19 16:22:06 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.2 2006/12/06 16:20:30 ajacoutot Exp $
bin/avidemux2
share/locale/cs/LC_MESSAGES/avidemux.mo
share/locale/es/LC_MESSAGES/avidemux.mo
share/locale/fr/LC_MESSAGES/avidemux.mo
@comment share/locale/klingon/
@comment share/locale/klingon/LC_MESSAGES/
@comment share/locale/klingon/LC_MESSAGES/avidemux.mo
share/locale/ru/LC_MESSAGES/avidemux.mo