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

- update to mjpegtools-2.0.0

Browse Source 
from brad
ok aja@
This commit is contained in:
jasper 2012-06-20 08:45:37 +00:00
parent 4e6d900ce6
commit 641b0395eb
10 changed files with 130 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
multimedia/mjpegtools/Makefile
View File

@ -1,22 +1,17 @@
# $OpenBSD: Makefile,v 1.29 2011/09/16 10:31:23 espie Exp $
# $OpenBSD: Makefile,v 1.30 2012/06/20 08:45:37 jasper Exp $
COMMENT= tools to edit/modify/encode video streams
DISTNAME= mjpegtools-1.9.0rc3
REVISION= 7
DISTNAME= mjpegtools-2.0.0
CATEGORIES= multimedia
SHARED_LIBS= lavfile 4.0 \
lavfile-1.9 4.0 \
lavjpeg 4.0 \
lavjpeg-1.9 4.0 \
lavplay 4.0 \
lavplay-1.9 4.0 \
mjpegutils 4.0 \
mjpegutils-1.9 4.0 \
mpeg2encpp 5.0 \
mpeg2encpp-1.9 5.0 \
mplex2 5.0 \
mplex2-1.9 5.0
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mjpeg/}
SHARED_LIBS= lavfile 5.0 \
lavjpeg 5.0 \
lavplay 5.0 \
mjpegutils 5.0 \
mpeg2encpp 6.0 \
mplex2 6.0 \
HOMEPAGE= http://mjpeg.sourceforge.net/
@ -26,49 +21,43 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mjpeg/}
WANTLIB= GL SDL SDL_gfx X11 Xau Xcomposite Xcursor Xdamage \
Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm \
atk-1.0 c cairo drm dv expat ffi fontconfig freetype \
gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
gobject-2.0 gthread-2.0 gtk-x11-2.0 jpeg m pango-1.0 \
pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread \
pthread-stubs sndio stdc++ usbhid xcb xcb-render \
xcb-shm z
WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo \
expat fontconfig freetype gio-2.0 glib-2.0 \
gmodule-2.0 gobject-2.0 m pango-1.0 pangocairo-1.0 \
pangoft2-1.0 pcre pthread pthread-stubs pixman-1 \
sndio stdc++ usbhid xcb z gthread-2.0 xcb-render \
xcb-render-util SDL dv jpeg png gdk-x11-2.0 \
gdk_pixbuf-2.0 gtk-x11-2.0
MODULES+= devel/gettext
MODULES= devel/gettext
LIB_DEPENDS= sdl-*-!no_x11:devel/sdl \
multimedia/libdv \
devel/sdl-gfx \
graphics/jpeg \
graphics/png \
multimedia/libdv \
x11/gtk+2 \
USE_LIBTOOL= Yes
USE_GROFF = Yes
CONFIGURE_STYLE= gnu
USE_GROFF= Yes
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.68
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--with-x \
--with-libpng \
--with-libdv
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
LDFLAGS="-L${LOCALBASE}/lib" \
PKG_CONFIG="/usr/bin/pkg-config"
--without-v4l
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
FLAVORS= quicktime optimized
FLAVOR?=
.if ${FLAVOR:L:Moptimized}
CONFIGURE_ARGS+= --enable-simd-accel
.else
.if !${FLAVOR:L:Moptimized}
CONFIGURE_ARGS+= --disable-simd-accel
.endif
.if ${FLAVOR:L:Mquicktime}
LIB_DEPENDS += multimedia/libquicktime
WANTLIB += quicktime>=2 GL
CONFIGURE_ARGS += --with-libquicktime
WANTLIB+= quicktime>=2
.else
CONFIGURE_ARGS += --without-libquicktime
.endif

10
multimedia/mjpegtools/distinfo
View File

@ -1,5 +1,5 @@
MD5 (mjpegtools-1.9.0rc3.tar.gz) = 042tRDM+MjbMwNwe/bJ5EA==
RMD160 (mjpegtools-1.9.0rc3.tar.gz) = 9HxxzXYoH7bgL9o9CLChQuE85ec=
SHA1 (mjpegtools-1.9.0rc3.tar.gz) = QXgW5UjZ+7bDNt9kuI8xsC1v87E=
SHA256 (mjpegtools-1.9.0rc3.tar.gz) = ix4+hSicudWKe5jQMs8lh+qVf4ZkFqM1kYZnsdrHb/c=
SIZE (mjpegtools-1.9.0rc3.tar.gz) = 2537088
MD5 (mjpegtools-2.0.0.tar.gz) = kD4eO5Z+68xf5WJtdRfcRg==
RMD160 (mjpegtools-2.0.0.tar.gz) = RU4jvtsr1ZKRKlRtBiG1w2YsO7I=
SHA1 (mjpegtools-2.0.0.tar.gz) = 9BHoVz1EZxHb6EVaauklfhr+HnA=
SHA256 (mjpegtools-2.0.0.tar.gz) = vzVBWT5xYC97RAwufYG0M/U9BRHnRkLzW+qbP+3tepc=
SIZE (mjpegtools-2.0.0.tar.gz) = 1749671

39
multimedia/mjpegtools/patches/patch-configure_ac Normal file
View File

@ -0,0 +1,39 @@
$OpenBSD: patch-configure_ac,v 1.3 2012/06/20 08:45:37 jasper Exp $
--- configure.ac.orig Wed Oct 5 00:34:39 2011
+++ configure.ac Wed Oct 5 00:35:53 2011
@@ -445,35 +445,6 @@ EOF
fi
fi
-dnl *********************************************************************
-dnl For x86 and ppc machines check which code model we should use. This is
-dnl done with the helper script cpuinfo.sh because the logic to do the job
-dnl correctly is complex and lengthy (about as long as the entire configure.ac
-dnl file).
-
-if test x$have_x86cpu = xtrue -o x$have_ppccpu = xtrue; then
- if test x$host_alias != x; then
- dnl This is to allow cross compiling
- AC_MSG_CHECKING(sub-architecture settings)
- if test x$have_x86cpu = xtrue; then
- host_mod_cpu=`echo $host_cpu | tr _ -`
- ARCHFLAGS="-march=$host_mod_cpu -mcpu=$host_mod_cpu"
- fi
- else
- if test ! -r $srcdir/cpuinfo.sh; then
- AC_MSG_ERROR([cpuinfo.sh script not found - do a cvs update])
- fi
- AC_MSG_CHECKING(sub-architecture settings)
- chmod +x $srcdir/cpuinfo.sh
- if test x$have_x86cpu = xtrue; then
- ARCHFLAGS=`$srcdir/cpuinfo.sh x86`
- elif test x$have_ppccpu = xtrue; then
- ARCHFLAGS=`$srcdir/cpuinfo.sh ppc`
- fi
- fi
- AC_MSG_RESULT($ARCHFLAGS)
-fi
-
dnl **********************************************************************
dnl Handle forcing static linkage in key places
if test "x$enable_static_build" = "xyes" ; then

12
multimedia/mjpegtools/patches/patch-lavtools_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lavtools_Makefile_in,v 1.4 2012/06/20 08:45:37 jasper Exp $
--- lavtools/Makefile.in.orig Sun Oct 9 17:31:35 2011
+++ lavtools/Makefile.in Sun Oct 9 17:31:52 2011
@@ -445,7 +445,7 @@ liblavinclude_HEADERS = \
LAV_ALL_LIB_OPTS = \
$(LT_STATIC) \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -release $(LT_RELEASE) $(EXTRA_LDFLAGS)
+ $(EXTRA_LDFLAGS)
liblavfile_la_SOURCES = editlist.c lav_io.c avilib.c
liblavfile_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(JPEG_CFLAGS)

12
multimedia/mjpegtools/patches/patch-mpeg2enc_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-mpeg2enc_Makefile_in,v 1.4 2012/06/20 08:45:37 jasper Exp $
--- mpeg2enc/Makefile.in.orig Sun Oct 9 17:32:51 2011
+++ mpeg2enc/Makefile.in Sun Oct 9 17:33:02 2011
@@ -356,7 +356,7 @@ libmpeg2encpp_include_HEADERS = elemstrmwriter.hh enco
libmpeg2encpp_la_LDFLAGS = \
${LT_STATIC} \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -release $(LT_RELEASE) ${EXTRA_LDFLAGS}
+ ${EXTRA_LDFLAGS}
libmpeg2encpp_la_DEPENDENCIES = $(LIBMJPEGUTILS)
libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTILS) @PTHREAD_LIBS@

12
multimedia/mjpegtools/patches/patch-mplex_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-mplex_Makefile_in,v 1.3 2012/06/20 08:45:37 jasper Exp $
--- mplex/Makefile.in.orig Sun Oct 9 17:32:35 2011
+++ mplex/Makefile.in Sun Oct 9 17:32:46 2011
@@ -335,7 +335,7 @@ libmplex_include_HEADERS = \
libmplex2_la_LDFLAGS = \
$(LT_STATIC) \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -release $(LT_RELEASE) $(EXTRA_LDFLAGS)
+ $(EXTRA_LDFLAGS)
libmplex2_la_LIBADD = $(top_builddir)/utils/libmjpegutils.la \
$(am__append_1)

12
multimedia/mjpegtools/patches/patch-utils_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-utils_Makefile_in,v 1.3 2012/06/20 08:45:37 jasper Exp $
--- utils/Makefile.in.orig Sun Oct 9 17:31:58 2011
+++ utils/Makefile.in Sun Oct 9 17:32:28 2011
@@ -304,7 +304,7 @@ libmjpegutils_la_LIBADD = $(mmxsse_lib) $(altivec_lib)
libmjpegutils_la_LDFLAGS = \
$(LT_STATIC) \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- -release $(LT_RELEASE) $(EXTRA_LDFLAGS)
+ $(EXTRA_LDFLAGS)
libmjpegutils_la_SOURCES = \
mjpeg_logging.c \

8
multimedia/mjpegtools/pkg/DESCR
View File

@ -1,11 +1,11 @@
The MJPEG-tools are a basic set of utilities for editing, playing back,
filtering and encoding video under UNIX-like operating systems.
There are two FLAVORS for this port:
Flavors:
quicktime - builds the package with support for reading and writing
quicktime ".mov" files
quicktime - Builds the package with support for reading and writing
QuickTime ".MOV" files.
optimized - builds the package with SSE instructions. Packages built
optimized - Builds the package with SSE instructions. Packages built
with this FLAVOR might not run on systems that are not SSE
capable.

8
multimedia/mjpegtools/pkg/PFRAG.shared
View File

@ -1,13 +1,7 @@
@comment $OpenBSD: PFRAG.shared,v 1.5 2008/01/26 02:10:26 jakemsr Exp $
@lib lib/liblavfile-1.9.so.${LIBlavfile-1.9_VERSION}
@comment $OpenBSD: PFRAG.shared,v 1.6 2012/06/20 08:45:37 jasper Exp $
@lib lib/liblavfile.so.${LIBlavfile_VERSION}
@lib lib/liblavjpeg-1.9.so.${LIBlavjpeg-1.9_VERSION}
@lib lib/liblavjpeg.so.${LIBlavjpeg_VERSION}
@lib lib/liblavplay-1.9.so.${LIBlavplay-1.9_VERSION}
@lib lib/liblavplay.so.${LIBlavplay_VERSION}
@lib lib/libmjpegutils-1.9.so.${LIBmjpegutils-1.9_VERSION}
@lib lib/libmjpegutils.so.${LIBmjpegutils_VERSION}
@lib lib/libmpeg2encpp-1.9.so.${LIBmpeg2encpp-1.9_VERSION}
@lib lib/libmpeg2encpp.so.${LIBmpeg2encpp_VERSION}
@lib lib/libmplex2-1.9.so.${LIBmplex2-1.9_VERSION}
@lib lib/libmplex2.so.${LIBmplex2_VERSION}

9
multimedia/mjpegtools/pkg/PLIST
View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.7 2009/01/30 00:41:24 sthen Exp $
@comment $OpenBSD: PLIST,v 1.8 2012/06/20 08:45:37 jasper Exp $
@conflict mplex-*
%%SHARED%%
%%quicktime%%
bin/anytovcd.sh
@bin bin/glav
@ -78,9 +79,8 @@ include/mjpegtools/mpeg2enc/mpeg2encoder.hh
include/mjpegtools/mpeg2enc/mpeg2encoptions.hh
include/mjpegtools/mpeg2enc/mpeg2encparams.h
include/mjpegtools/mpeg2enc/mpeg2syntaxcodes.h
include/mjpegtools/mpeg2enc/ontheflyratectl.hh
include/mjpegtools/mpeg2enc/pass1ratectl.hh
include/mjpegtools/mpeg2enc/pass2ratectl.hh
include/mjpegtools/mpeg2enc/ontheflyratectlpass1.hh
include/mjpegtools/mpeg2enc/ontheflyratectlpass2.hh
include/mjpegtools/mpeg2enc/picture.hh
include/mjpegtools/mpeg2enc/picturereader.hh
include/mjpegtools/mpeg2enc/predict_ref.h
@ -156,4 +156,3 @@ lib/pkgconfig/mjpegtools.pc
@man man/man1/yuvscaler.1
@man man/man1/yuvycsnoise.1
@man man/man5/yuv4mpeg.5
%%SHARED%%