From 6dd33011b21c4863070b9e1da1bba95d99e71817 Mon Sep 17 00:00:00 2001 From: jasper Date: Wed, 4 Mar 2009 20:21:57 +0000 Subject: [PATCH] - fix license versions - regen DESCRs, PLISTS - regen WANTLIBs ok ajacoutot@ landry@ (as part of another diff) --- multimedia/libquicktime/Makefile | 21 +++++++++------------ multimedia/libquicktime/pkg/DESCR | 8 ++++---- multimedia/mjpegtools/Makefile | 8 +++++--- multimedia/mjpegtools/pkg/DESCR | 15 +++++++-------- multimedia/mjpegtools/pkg/PFRAG.quicktime | 6 +++--- multimedia/transcode/Makefile | 9 +++++---- 6 files changed, 33 insertions(+), 34 deletions(-) diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile index d8a37a00405..783e9c1ed62 100644 --- a/multimedia/libquicktime/Makefile +++ b/multimedia/libquicktime/Makefile @@ -1,31 +1,28 @@ -# $OpenBSD: Makefile,v 1.15 2008/07/09 02:13:01 jakemsr Exp $ +# $OpenBSD: Makefile,v 1.16 2009/03/04 20:21:57 jasper Exp $ # $FreeBSD: ports/multimedia/libquicktime/Makefile,v 1.19 2004/03/16 04:23:53 edwin Exp $ SHARED_ONLY= Yes COMMENT= library for reading and writing quicktime files DISTNAME= libquicktime-1.0.2 -PKGNAME= ${DISTNAME}p1 +PKGNAME= ${DISTNAME}p2 CATEGORIES= multimedia SHARED_LIBS= quicktime 3.0 HOMEPAGE= http://libquicktime.sourceforge.net/ -# GPL +# LGPLv2.1 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= GL ICE SM X11 Xau Xaw Xcomposite Xcursor \ - Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr \ - Xrender Xt Xv atk-1.0.>=1011.3 a52 c expat \ - faac faad fontconfig freetype \ - glib-2.0.>=800.3 gmodule-2.0.>=800.3 \ - gobject-2.0.>=800.3 m ogg ossaudio \ - pango-1.0.>=1001.1 pangocairo-1.0.>=1001.1 \ - cairo glitz pangoft2-1.0.>=1001.1 pthread \ - pcre pixman-1 theora x264 z +WANTLIB += GL ICE SM X11 Xau Xaw Xcomposite Xcursor Xdamage Xdmcp +WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xt Xv a52 atk-1.0 +WANTLIB += c cairo expat faac faad fontconfig freetype gio-2.0 +WANTLIB += glib-2.0 glitz gmodule-2.0 gobject-2.0 m ogg ossaudio +WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 +WANTLIB += pthread theora x264 z MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libquicktime/} diff --git a/multimedia/libquicktime/pkg/DESCR b/multimedia/libquicktime/pkg/DESCR index 5ed87e1bf4f..2557ad0c31b 100644 --- a/multimedia/libquicktime/pkg/DESCR +++ b/multimedia/libquicktime/pkg/DESCR @@ -1,4 +1,4 @@ -This is libquicktime, a library for reading and writing quicktime -files. It is based on, and compatible with, the quicktime4linux -library. This package also includes a program to play quicktime -movies, and some other programs to work with quicktime files. +This is libquicktime, a library for reading and writing quicktime files. +It is based on, and compatible with, the quicktime4linux library. This +package also includes a program to play quicktime movies, and some other +programs to work with quicktime files. diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile index a1ce3e7e35e..4a4a22e1d46 100644 --- a/multimedia/mjpegtools/Makefile +++ b/multimedia/mjpegtools/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.18 2009/01/30 00:41:24 sthen Exp $ +# $OpenBSD: Makefile,v 1.19 2009/03/04 20:21:57 jasper Exp $ COMMENT= tools to edit/modify/encode video streams DISTNAME= mjpegtools-1.9.0rc3 -PKGNAME= ${DISTNAME}p2 +PKGNAME= ${DISTNAME}p3 CATEGORIES= multimedia SHARED_LIBS= lavfile 4.0 \ lavfile-1.9 4.0 \ @@ -46,7 +46,9 @@ USE_X11= Yes USE_LIBTOOL= Yes CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --with-x --with-libpng --with-libdv + --with-x \ + --with-libpng \ + --with-libdv CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \ LDFLAGS="-L${LOCALBASE}/lib" \ diff --git a/multimedia/mjpegtools/pkg/DESCR b/multimedia/mjpegtools/pkg/DESCR index 52ec9b77055..2c19aef755f 100644 --- a/multimedia/mjpegtools/pkg/DESCR +++ b/multimedia/mjpegtools/pkg/DESCR @@ -1,12 +1,11 @@ -The MJPEG-tools are a basic set of utilities for editing, playing -back, filtering and encoding video under UNIX-like operating systems. +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: - 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 with - this FLAVOR might not run on systems that are not SSE capable. + optimized - builds the package with SSE instructions. Packages built + with this FLAVOR might not run on systems that are not SSE + capable. diff --git a/multimedia/mjpegtools/pkg/PFRAG.quicktime b/multimedia/mjpegtools/pkg/PFRAG.quicktime index ae1171a66ea..34b99279f48 100644 --- a/multimedia/mjpegtools/pkg/PFRAG.quicktime +++ b/multimedia/mjpegtools/pkg/PFRAG.quicktime @@ -1,3 +1,3 @@ -@comment $OpenBSD: PFRAG.quicktime,v 1.1 2008/01/26 02:10:26 jakemsr Exp $ -bin/qttoy4m -bin/y4mtoqt +@comment $OpenBSD: PFRAG.quicktime,v 1.2 2009/03/04 20:21:57 jasper Exp $ +@bin bin/qttoy4m +@bin bin/y4mtoqt diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index d073e0de819..0408f8be331 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -1,23 +1,24 @@ -# $OpenBSD: Makefile,v 1.20 2008/07/09 02:13:01 jakemsr Exp $ +# $OpenBSD: Makefile,v 1.21 2009/03/04 20:21:57 jasper Exp $ SHARED_ONLY= Yes COMMENT= video stream processing tools DISTNAME= transcode-1.0.5 -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 CATEGORIES= multimedia HOMEPAGE= http://www.transcoding.org/ -# GPL +# GPLv2 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes + WANTLIB= ICE SM X11 Xau Xaw Xdmcp Xext Xpm Xrandr \ Xrender Xt Xv c faac faad freetype m \ - pthread usbhid x264 z + pthread sndio usbhid x264 z MASTER_SITES= http://fromani.exit1.org/ EXTRACT_SUFX= .tar.bz2