Re: UPDATE: mjpegtools 2.0.0
On 12/10/11 3:38 PM, Matthias Kilian wrote: On Sun, Oct 09, 2011 at 06:24:22PM -0400, Brad wrote: Next, on top of your diff, here's the addition of devel/sdl-gfx to LIB_DEPENDS and some WANTLIB changes: Thanks. And finally, multimedia/gstreamer-0.10/plugins-bad still needs some love because it doesn't find interact.hpp: configure: *** checking feature: mplex *** configure: *** for plug-ins: mplex *** checking for MPLEX... yes checking interact.hpp usability... no checking interact.hpp presence... no checking for interact.hpp... no configure: *** These plugins will not be built: mplex *sigh* The mjpegtools authors are idiots... anyway, that issue has been fixed. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: mjpegtools 2.0.0
On Thu, Oct 06, 2011 at 04:32:31PM -0400, Brad wrote:
Here is an update to mjpegtools 2.0.0.
An updated diff for mjpegtools and WANTLIB update
diff for gst-plugins-bad.
Index: Makefile
===
RCS file: /home/cvs/ports/multimedia/mjpegtools/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile16 Sep 2011 10:31:23 - 1.29
+++ Makefile12 Oct 2011 20:31:28 -
@@ -2,21 +2,16 @@
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,42 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mjpeg/}
-
-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
+WANTLIB+= GL SDL SDL_gfx X11 Xau Xcomposite Xcursor Xdamage Xdmcp
+WANTLIB+= Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0
+WANTLIB+= c cairo drm dv expat ffi fontconfig freetype gdk-x11-2.0
+WANTLIB+= gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
+WANTLIB+= gthread-2.0 gtk-x11-2.0 jpeg m pango-1.0 pangocairo-1.0
+WANTLIB+= pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
+WANTLIB+= sndio stdc++ usbhid xcb xcb-render xcb-shm z
-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
Index: distinfo
===
RCS file: /home/cvs/ports/multimedia/mjpegtools/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo26 Jan 2008 02:10:26 - 1.5
+++ distinfo5 Oct 2011 04:20:02 -
@@ -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) =
Re: UPDATE: mjpegtools 2.0.0
On Sun, Oct 09, 2011 at 06:24:22PM -0400, Brad wrote:
An updated diff killing off the symlink crap.
First of all, I'd really prefer if someone who actually uses this
(and/or multimedia/dvdstyler and multimedia/gstreamer-0.10/plugins-bad)
could take over. I'm not using this stuff, I'm not doing much video
at all, and I still don't have much time.
Next, on top of your diff, here's the addition of devel/sdl-gfx to
LIB_DEPENDS and some WANTLIB changes:
--- Makefile.brad Wed Oct 12 20:30:17 2011
+++ MakefileWed Oct 12 20:31:04 2011
@@ -26,9 +26,12 @@
WANTLIB+= dv expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB+= gtk-x11-2.0 jpeg m pcre pixman-1 png pthread
pthread-stubs
WANTLIB+= sndio stdc++ usbhid xcb xcb-render xcb-shm z
+WANTLIB+= SDL_gfx atk-1.0 ffi gio-2.0 glib-2.0 gmodule-2.0
gobject-2.0
+WANTLIB+= gthread-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0
MODULES= devel/gettext
LIB_DEPENDS= sdl-*-!no_x11:devel/sdl \
+ devel/sdl-gfx \
graphics/jpeg \
graphics/png \
multimedia/libdv \
And finally, multimedia/gstreamer-0.10/plugins-bad still needs some
love because it doesn't find interact.hpp:
configure: *** checking feature: mplex ***
configure: *** for plug-ins: mplex ***
checking for MPLEX... yes
checking interact.hpp usability... no
checking interact.hpp presence... no
checking for interact.hpp... no
configure: *** These plugins will not be built: mplex
Ciao,
Kili
Index: Makefile
===
RCS file: /home/cvs/ports/multimedia/mjpegtools/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile 16 Sep 2011 10:31:23 - 1.29
+++ Makefile 9 Oct 2011 21:33:29 -
@@ -2,21 +2,16 @@
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,39 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP=Yes
-MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=mjpeg/}
-
-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
+WANTLIB+=GL SDL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
+WANTLIB+=Xfixes Xi Xinerama Xrandr Xrender Xxf86vm c cairo drm
+WANTLIB+=dv expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB+=gtk-x11-2.0 jpeg m pcre pixman-1 png pthread
pthread-stubs
+WANTLIB+=sndio stdc++ usbhid xcb xcb-render xcb-shm z
-MODULES+=devel/gettext
+MODULES= devel/gettext
LIB_DEPENDS= sdl-*-!no_x11:devel/sdl \
- multimedia/libdv \
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 \
-
Re: UPDATE: mjpegtools 2.0.0
On Thu, Oct 06, 2011 at 04:32:31PM -0400, Brad wrote:
Here is an update to mjpegtools 2.0.0.
[...]
-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 \
+ lavfile-2.0 5.0 \
+ lavjpeg 5.0 \
+ lavjpeg-2.0 5.0 \
+ lavplay 5.0 \
+ lavplay-2.0 5.0 \
+ mjpegutils 5.0 \
+ mjpegutils-2.0 5.0 \
+ mpeg2encpp 6.0 \
+ mpeg2encpp-2.0 6.0 \
+ mplex2 6.0 \
+ mplex2-2.0 6.0
It would be easier if the libraries could be installed without the
version number (-1.9 resp. 2.0 after the update). Currently, there
are symlinks like libmplex2.so.5.0 - libmplex2-1.9.so.5.0 (or
libmplex2.so.6.0 - libmplex2-2.0.so.6.0), which doesn't make sense,
and which causes multimedia/gstreamer-0.10/plugins-bad to break
(because it explicitely includes-1.9 mpeg2encpp-1.9 mplex2-1.9 in
WANTLIB-mjpeg).
While this could be worked around by changing WANTLIB-mjpeg in
multimedia/gstreamer-0.10/plugins-bad, I'd like to see a diff that
fixes the shared libs/symlink stuff.
Ciao,
Kili
Re: UPDATE: mjpegtools 2.0.0
On Thu, Oct 06, 2011 at 04:32:31PM -0400, Brad wrote:
Here is an update to mjpegtools 2.0.0.
An updated diff killing off the symlink crap.
Index: Makefile
===
RCS file: /home/cvs/ports/multimedia/mjpegtools/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile16 Sep 2011 10:31:23 - 1.29
+++ Makefile9 Oct 2011 21:33:29 -
@@ -2,21 +2,16 @@
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,39 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mjpeg/}
-
-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
+WANTLIB+= GL SDL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
+WANTLIB+= Xfixes Xi Xinerama Xrandr Xrender Xxf86vm c cairo drm
+WANTLIB+= dv expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB+= gtk-x11-2.0 jpeg m pcre pixman-1 png pthread
pthread-stubs
+WANTLIB+= sndio stdc++ usbhid xcb xcb-render xcb-shm z
-MODULES+= devel/gettext
+MODULES= devel/gettext
LIB_DEPENDS= sdl-*-!no_x11:devel/sdl \
- multimedia/libdv \
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
Index: distinfo
===
RCS file: /home/cvs/ports/multimedia/mjpegtools/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo26 Jan 2008 02:10:26 - 1.5
+++ distinfo5 Oct 2011 04:20:02 -
@@ -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
Re: UPDATE: mjpegtools 2.0.0
On 09/10/11 5:28 PM, Matthias Kilian wrote:
On Thu, Oct 06, 2011 at 04:32:31PM -0400, Brad wrote:
Here is an update to mjpegtools 2.0.0.
[...]
-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 \
+ lavfile-2.0 5.0 \
+ lavjpeg 5.0 \
+ lavjpeg-2.0 5.0 \
+ lavplay 5.0 \
+ lavplay-2.0 5.0 \
+ mjpegutils 5.0 \
+ mjpegutils-2.0 5.0 \
+ mpeg2encpp 6.0 \
+ mpeg2encpp-2.0 6.0 \
+ mplex2 6.0 \
+ mplex2-2.0 6.0
It would be easier if the libraries could be installed without the
version number (-1.9 resp. 2.0 after the update). Currently, there
are symlinks like libmplex2.so.5.0 - libmplex2-1.9.so.5.0 (or
libmplex2.so.6.0 - libmplex2-2.0.so.6.0), which doesn't make sense,
and which causes multimedia/gstreamer-0.10/plugins-bad to break
(because it explicitely includes-1.9 mpeg2encpp-1.9 mplex2-1.9 in
WANTLIB-mjpeg).
While this could be worked around by changing WANTLIB-mjpeg in
multimedia/gstreamer-0.10/plugins-bad, I'd like to see a diff that
fixes the shared libs/symlink stuff.
Ya, that's fine with me. The symlink stuff is retarded.
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
