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

update to libquicktime-1.0.2

Browse Source 
build gpl modules as well (AAC and H264)
This commit is contained in:
jakemsr 2008-01-26 02:02:50 +00:00
parent 64bd5edcd7
commit 5503c4818e
12 changed files with 136 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
multimedia/libquicktime/Makefile
View File

@ -1,29 +1,30 @@
# $OpenBSD: Makefile,v 1.12 2007/05/25 16:03:57 jakemsr Exp $
# $OpenBSD: Makefile,v 1.13 2008/01/26 02:02:50 jakemsr 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-0.9.7
PKGNAME= ${DISTNAME}p3
DISTNAME= libquicktime-1.0.2
CATEGORIES= multimedia
SHARED_LIBS= quicktime 2.0
SHARED_LIBS= quicktime 3.0
HOMEPAGE= http://libquicktime.sourceforge.net/
# LGPL
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= GL GLU ICE SM X11 Xau Xaw Xcursor Xdmcp Xext \
Xfixes Xi Xinerama Xrandr Xrender Xt Xv \
atk-1.0.>=1011.3 c expat fontconfig freetype \
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 z
cairo glitz pangoft2-1.0.>=1001.1 pthread \
pcre theora x264 z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libquicktime/}
@ -34,23 +35,21 @@ LIB_DEPENDS= vorbis.>=3,vorbisfile.>=4,vorbisenc.>=2::audio/libvorbis \
png.>=4::graphics/png \
dv.>=4::multimedia/libdv \
mp3lame::audio/lame \
avcodec.>=7::graphics/ffmpeg \
avcodec.>=11,avutil.>=5::graphics/ffmpeg \
gtk-x11-2.0.>=800.8,gdk-x11-2.0.>=800.8,gdk_pixbuf-2.0.>=800.8::x11/gtk+2
VMEM_WARNING= Yes
AUTOCONF_VERSION= 2.59
USE_X11= Yes
USE_LIBTOOL= Yes
LIBTOOL_FLAGS+= --tag=disable-static
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= autoconf
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
LDFLAGS="-L${LOCALBASE}/lib" \
AVCODEC_LIBS="$$(pkg-config --libs libavcodec)"
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
ac_cv_search_pthread_create=-pthread
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--disable-firewire \
--with-avcodec="${LOCALBASE}" \
--with-vorbis-libraries="${LOCALBASE}/lib -logg"
--enable-gpl \
--without-alsa \
--with-avcodec="${LOCALBASE}"
.include <bsd.port.mk>

10
multimedia/libquicktime/distinfo
View File

@ -1,5 +1,5 @@
MD5 (libquicktime-0.9.7.tar.gz) = 5cl3Vn31nIdsUKwZG7HK9g==
RMD160 (libquicktime-0.9.7.tar.gz) = qIbLxxQwbZSXdhbeciGhkpj6JR0=
SHA1 (libquicktime-0.9.7.tar.gz) = kzRrippBGkvflyg/vzrI7VIlLHM=
SHA256 (libquicktime-0.9.7.tar.gz) = Q7Oxs6TKJMIBfx+gRwQl5SK1k0a3QgOzn5mR9qe2CF4=
SIZE (libquicktime-0.9.7.tar.gz) = 765719
MD5 (libquicktime-1.0.2.tar.gz) = SkOkStz77DmKkcVtHty9wQ==
RMD160 (libquicktime-1.0.2.tar.gz) = ilm1yMb3jXfhET6c6oXwG4h1ZAs=
SHA1 (libquicktime-1.0.2.tar.gz) = UWu5GveoNm07olCQiSlAV1ri1/o=
SHA256 (libquicktime-1.0.2.tar.gz) = 0/PJ3hM+DxtcfO2vbmtTXtfVg9YntSBWBsYvDTUo5bg=
SIZE (libquicktime-1.0.2.tar.gz) = 1131731

22
multimedia/libquicktime/patches/patch-acinclude_m4
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-acinclude_m4,v 1.2 2006/03/20 05:51:59 jakemsr Exp $
--- acinclude.m4.orig Sun Jan 9 14:50:53 2005
+++ acinclude.m4 Thu Feb 2 22:24:47 2006
@@ -387,7 +387,7 @@ AC_TRY_RUN([
if(LIBAVCODEC_BUILD < $1)
return -1;
output=fopen("avcodec_version", "w");
- fprintf(output, LIBAVCODEC_VERSION);
+ fprintf(output, "%lld", LIBAVCODEC_VERSION_INT);
fclose(output);
return 0;
}
@@ -427,7 +427,8 @@ dnl
if test "x$avcodec_prefix" != x; then
AVCODEC_CFLAGS="-I$avcodec_prefix/include"
-AVCODEC_LIBS="-L$avcodec_prefix/lib -lavcodec"
+dnl AVCODEC_LIBS="-L$avcodec_prefix/lib -lavcodec"
+AVCODEC_LIBS="$AVCODEC_LIBS"
ACL_CHECK_AVCODEC([$1])
if test "x$avcodec_ok" = "xtrue"; then
avcodec_done="true"

28
multimedia/libquicktime/patches/patch-configure Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-configure,v 1.6 2008/01/26 02:02:50 jakemsr Exp $
--- configure.orig Tue Jan 8 14:00:53 2008
+++ configure Sat Jan 19 21:52:53 2008
@@ -24861,7 +24861,7 @@ fi
VORBIS_LIBS="-L$prefix/lib"
fi
- VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm"
+ VORBIS_LIBS="$VORBIS_LIBS -lvorbis -logg -lm"
VORBISFILE_LIBS="-lvorbisfile"
VORBISENC_LIBS="-lvorbisenc"
@@ -25076,11 +25076,11 @@ if test "x$with_lame" != "xno"; then
OLD_CFLAGS=$CFLAGS
OLD_LIBS=$LIBS
-if test x$have_vorbis = xtrue; then
-LIBS="$LIBS -lmp3lame -lvorbis -lm"
-else
+#if test x$have_vorbis = xtrue; then
+#LIBS="$LIBS -lmp3lame -lvorbis -lm"
+#else
LIBS="$LIBS -lmp3lame -lm"
-fi
+#fi
{ echo "$as_me:$LINENO: checking for lame" >&5

72
multimedia/libquicktime/patches/patch-configure_ac
View File

@ -1,19 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.2 2006/03/20 05:51:59 jakemsr Exp $
--- configure.ac.orig Thu May 26 06:35:22 2005
+++ configure.ac Thu Feb 2 22:41:52 2006
@@ -104,8 +104,10 @@ AC_CHECK_LIB(dl, dlopen)
AC_CHECK_LIB(z, inflateEnd)
AC_CHECK_LIB(m, cos)
-AC_SEARCH_LIBS(pthread_create, [gthread pthread c_r])
+dnl AC_SEARCH_LIBS(pthread_create, [gthread pthread c_r])
+LIBS="$LIBS -pthread"
+
AC_SUBST(LIBS)
AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h linux/videodev.h sys/soundcard.h soundcard.h stddef.h)
@@ -138,6 +140,9 @@ VORBIS_REQUIRED="1.0"
$OpenBSD: patch-configure_ac,v 1.3 2008/01/26 02:02:50 jakemsr Exp $
--- configure.ac.orig Wed Jan 2 12:57:44 2008
+++ configure.ac Sat Jan 19 21:06:11 2008
@@ -190,6 +190,9 @@ VORBIS_REQUIRED="1.0"
have_vorbis=false
AH_TEMPLATE([HAVE_VORBIS], [Vorbis libraries are there])
@ -21,9 +9,9 @@ $OpenBSD: patch-configure_ac,v 1.2 2006/03/20 05:51:59 jakemsr Exp $
+OLD_LIBS="$LIBS"
+LIBS="$LIBS -logg"
if test "x$with_vorbis" != "xno"; then
XIPH_PATH_VORBIS(have_vorbis=true)
AM_CONDITIONAL(HAVE_VORBIS, test x$have_vorbis = xtrue)
@@ -145,7 +150,9 @@ AM_CONDITIONAL(HAVE_VORBIS, test x$have_
@@ -199,7 +202,9 @@ AM_CONDITIONAL(HAVE_VORBIS, test x$have_vorbis = xtrue
if test x$have_vorbis = xtrue; then
AC_DEFINE(HAVE_VORBIS)
fi
@ -34,7 +22,7 @@ $OpenBSD: patch-configure_ac,v 1.2 2006/03/20 05:51:59 jakemsr Exp $
AC_SUBST(VORBIS_REQUIRED)
dnl
@@ -158,11 +165,11 @@ have_lame="false"
@@ -216,11 +221,11 @@ if test "x$with_lame" != "xno"; then
OLD_CFLAGS=$CFLAGS
OLD_LIBS=$LIBS
@ -50,49 +38,3 @@ $OpenBSD: patch-configure_ac,v 1.2 2006/03/20 05:51:59 jakemsr Exp $
dnl CFLAGS="$CFLAGS"
@@ -235,9 +242,9 @@ fi
ALSA_CFLAGS="$ALSA_CFLAGS"
AC_SUBST(ALSA_CFLAGS)
-# NetBSD 2.0 (for whatever reason) moved the audio routines to a new place
-AH_TEMPLATE([HAVE_LIBOSSAUDIO], [Have -lossaudio for NetBSD 2.x?])
-AC_CHECK_LIB(ossaudio, _oss_ioctl)
+# NetBSD and OpenBSD have an OSS compatability library
+AH_TEMPLATE([HAVE_LIBOSSAUDIO], [Have -lossaudio for NetBSD and OpenBSD])
+AC_CHECK_LIB(ossaudio, _oss_ioctl, [have_libossaudio=true])
if test x$have_libossaudio = xtrue; then
AC_DEFINE(HAVE_LIBOSSAUDIO,1)
OSSAUDIO_LIBS=-lossaudio
@@ -457,9 +464,14 @@ have_libavcodec=false
AVCODEC_BUILD="4734"
+OLD_LIBS="$LIBS"
+LIBS="$LIBS -lavutil -lm -lz -pthread"
+
dnl PKG_CHECK_MODULES(AVCODEC, avcodec_acl = $AVCODEC_REQUIRED, have_libavcodec="true", have_libavcodec="false")
ACL_PATH_AVCODEC($AVCODEC_BUILD , have_libavcodec="true", have_libavcodec="false")
+LIBS="$OLD_LIBS"
+
AVCODEC_REQUIRED=$AVCODEC_VERSION
AM_CONDITIONAL(HAVE_LIBAVCODEC, test x$have_libavcodec = xtrue)
@@ -581,7 +593,7 @@ COMMON_CFLAGS="-finline-functions -Wall
dnl Optimizing flags
-LQT_OPT_CFLAGS($host_cpu, ["-O3 -funroll-all-loops -fomit-frame-pointer"])
+dnl LQT_OPT_CFLAGS($host_cpu, ["-O3 -funroll-all-loops -fomit-frame-pointer"])
AH_TEMPLATE([NDEBUG],
[Causes debug code to e removed])
@@ -590,7 +602,7 @@ if test x$LQT_DEBUG != xtrue; then
AC_DEFINE(NDEBUG)
fi
-CFLAGS="$OPT_CFLAGS $COMMON_CFLAGS"
+CFLAGS="$CFLAGS $OPT_CFLAGS $COMMON_CFLAGS"
# -L is required so that linker can find libquicktime when DESTDIR is used.
# libtool bug, documented at: http://www.geocrawler.com/mail/thread.php3?subject=install+phase+fails&list=404

20
multimedia/libquicktime/patches/patch-plugins_Makefile_in
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-plugins_Makefile_in,v 1.3 2006/02/03 04:55:56 jakemsr Exp $
--- plugins/Makefile.in.orig Thu May 26 18:57:30 2005
+++ plugins/Makefile.in Sun Jul 31 14:26:54 2005
@@ -58,7 +58,7 @@ RECURSIVE_TARGETS = all-recursive check-
uninstall-recursive
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = audiocodec videocodec opendivx rtjpeg mjpeg dv png \
+DIST_SUBDIRS = audiocodec videocodec rtjpeg mjpeg dv png \
vorbis ffmpeg lame
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -242,7 +242,6 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
base_subdirs = audiocodec \
videocodec \
-opendivx \
rtjpeg
@HAVE_LIBJPEG_FALSE@jpeg_subdirs =

12
multimedia/libquicktime/patches/patch-plugins_mjpeg_libmjpeg_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-plugins_mjpeg_libmjpeg_c,v 1.1 2006/02/03 04:55:56 jakemsr Exp $
--- plugins/mjpeg/libmjpeg.c.orig Sun Jul 31 15:19:29 2005
+++ plugins/mjpeg/libmjpeg.c Sun Jul 31 15:19:49 2005
@@ -19,7 +19,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h> /* for memcpy & bzero prototypes */
-#include "colormodels.h"
+#include <quicktime/colormodels.h>
#include "libmjpeg.h"
/* JPEG MARKERS */

11
multimedia/libquicktime/patches/patch-plugins_videocodec_yuv2_c
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-plugins_videocodec_yuv2_c,v 1.1 2006/02/03 04:55:56 jakemsr Exp $
--- plugins/videocodec/yuv2.c.orig Sun Jul 31 15:13:13 2005
+++ plugins/videocodec/yuv2.c Sun Jul 31 15:17:36 2005
@@ -1,6 +1,6 @@
#include "funcprotos.h"
#include <quicktime/colormodels.h>
-#include "quicktime.h"
+#include <quicktime/quicktime.h>
#include "yuv2.h"
/* U V values are signed but Y R G B values are unsigned! */

11
multimedia/libquicktime/patches/patch-plugins_videocodec_yuv4_c
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-plugins_videocodec_yuv4_c,v 1.1 2006/02/03 04:55:56 jakemsr Exp $
--- plugins/videocodec/yuv4.c.orig Sun Jul 31 15:18:07 2005
+++ plugins/videocodec/yuv4.c Sun Jul 31 15:18:19 2005
@@ -1,6 +1,6 @@
#include "funcprotos.h"
#include <quicktime/colormodels.h>
-#include "quicktime.h"
+#include <quicktime/quicktime.h>
#include "yuv4.h"
/* U V values are signed but Y R G B values are unsigned! */

8
multimedia/libquicktime/patches/patch-utils_lqtplay_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-utils_lqtplay_c,v 1.3 2006/02/03 04:55:56 jakemsr Exp $
--- utils/lqtplay.c.orig Mon May 23 06:33:55 2005
+++ utils/lqtplay.c Sun Jul 31 14:26:54 2005
@@ -912,7 +912,7 @@ static void qt_init(FILE *fp, char *file
$OpenBSD: patch-utils_lqtplay_c,v 1.4 2008/01/26 02:02:50 jakemsr Exp $
--- utils/lqtplay.c.orig Sat Nov 10 16:38:12 2007
+++ utils/lqtplay.c Sat Jan 19 21:06:11 2008
@@ -937,7 +937,7 @@ static void qt_init(FILE *fp, char *filename)
qt_hasaudio = 0;}
}
else {

14
multimedia/libquicktime/patches/patch-utils_yuv4toyuv_c
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-utils_yuv4toyuv_c,v 1.2 2006/02/03 04:55:56 jakemsr Exp $
--- utils/yuv4toyuv.c.orig Mon Dec 6 09:15:48 2004
+++ utils/yuv4toyuv.c Sun Jan 16 18:44:29 2005
$OpenBSD: patch-utils_yuv4toyuv_c,v 1.3 2008/01/26 02:02:50 jakemsr Exp $
--- utils/yuv4toyuv.c.orig Wed Feb 14 03:40:59 2007
+++ utils/yuv4toyuv.c Sat Jan 19 21:06:11 2008
@@ -1,5 +1,6 @@
#include <quicktime/lqt.h>
#include <lqt_funcprotos.h>
/*******************************************************************************
yuv4toyuv.c
+#include "funcprotos.h"
int usage(void)
{
libquicktime - A library for reading and writing quicktime/avi/mp4 files.
http://libquicktime.sourceforge.net

71
multimedia/libquicktime/pkg/PLIST
View File

@ -1,9 +1,9 @@
@comment $OpenBSD: PLIST,v 1.5 2006/02/03 04:55:56 jakemsr Exp $
@comment $OpenBSD: PLIST,v 1.6 2008/01/26 02:02:50 jakemsr Exp $
bin/libquicktime_config
bin/lqt-config
bin/lqt_transcode
bin/lqtplay
bin/lqtvrplay
bin/qt2text
bin/qtdechunk
bin/qtdump
bin/qtinfo
@ -13,11 +13,11 @@ bin/qtyuv4toyuv
include/lqt/
include/lqt/colormodels.h
include/lqt/lqt.h
include/lqt/lqt1394_config.h
include/lqt/lqt_atoms.h
include/lqt/lqt_codecapi.h
include/lqt/lqt_codecinfo.h
include/lqt/lqt_qtvr.h
include/lqt/lqt_version.h
include/lqt/qtprivate.h
include/lqt/quicktime.h
lib/libquicktime/
lib/libquicktime.la
@ -26,6 +26,10 @@ lib/libquicktime.la
lib/libquicktime/lqt_audiocodec.so
@comment lib/libquicktime/lqt_dv.la
lib/libquicktime/lqt_dv.so
lib/libquicktime/lqt_faac.la
lib/libquicktime/lqt_faac.so
lib/libquicktime/lqt_faad2.la
lib/libquicktime/lqt_faad2.so
@comment lib/libquicktime/lqt_ffmpeg.la
lib/libquicktime/lqt_ffmpeg.so
@comment lib/libquicktime/lqt_lame.la
@ -40,6 +44,65 @@ lib/libquicktime/lqt_rtjpeg.so
lib/libquicktime/lqt_videocodec.so
@comment lib/libquicktime/lqt_vorbis.la
lib/libquicktime/lqt_vorbis.so
lib/libquicktime/lqt_x264.la
lib/libquicktime/lqt_x264.so
lib/pkgconfig/libquicktime.pc
@man man/man1/lqtplay.1
share/aclocal/lqt.m4
share/doc/libquicktime/
share/doc/libquicktime/apiref/
share/doc/libquicktime/apiref/annotated.html
share/doc/libquicktime/apiref/colormodels_8h-source.html
share/doc/libquicktime/apiref/dir_53292056a2aca918f7f93eaa35ab24bb.html
share/doc/libquicktime/apiref/dir_ac6d6cfc5ba22cfe0e9bc6c52513f95c.html
share/doc/libquicktime/apiref/dirs.html
share/doc/libquicktime/apiref/doxygen.css
share/doc/libquicktime/apiref/doxygen.png
share/doc/libquicktime/apiref/files.html
share/doc/libquicktime/apiref/functions.html
share/doc/libquicktime/apiref/functions_vars.html
share/doc/libquicktime/apiref/globals.html
share/doc/libquicktime/apiref/globals_0x71.html
share/doc/libquicktime/apiref/globals_defs.html
share/doc/libquicktime/apiref/globals_enum.html
share/doc/libquicktime/apiref/globals_eval.html
share/doc/libquicktime/apiref/globals_func.html
share/doc/libquicktime/apiref/globals_type.html
share/doc/libquicktime/apiref/group__atoms.html
share/doc/libquicktime/apiref/group__audio.html
share/doc/libquicktime/apiref/group__audio__codecs.html
share/doc/libquicktime/apiref/group__audio__decode.html
share/doc/libquicktime/apiref/group__audio__encode.html
share/doc/libquicktime/apiref/group__codec__parameters.html
share/doc/libquicktime/apiref/group__codec__registry.html
share/doc/libquicktime/apiref/group__color.html
share/doc/libquicktime/apiref/group__general.html
share/doc/libquicktime/apiref/group__log.html
share/doc/libquicktime/apiref/group__metadata.html
share/doc/libquicktime/apiref/group__multichannel.html
share/doc/libquicktime/apiref/group__text.html
share/doc/libquicktime/apiref/group__text__decode.html
share/doc/libquicktime/apiref/group__text__encode.html
share/doc/libquicktime/apiref/group__video.html
share/doc/libquicktime/apiref/group__video__codecs.html
share/doc/libquicktime/apiref/group__video__decode.html
share/doc/libquicktime/apiref/group__video__encode.html
share/doc/libquicktime/apiref/index.html
share/doc/libquicktime/apiref/lqt_8h-source.html
share/doc/libquicktime/apiref/lqt_8h.html
share/doc/libquicktime/apiref/lqt__atoms_8h-source.html
share/doc/libquicktime/apiref/lqt__codecinfo_8h-source.html
share/doc/libquicktime/apiref/modules.html
share/doc/libquicktime/apiref/quicktime_8h-source.html
share/doc/libquicktime/apiref/quicktime_8h.html
share/doc/libquicktime/apiref/structlqt__codec__info__t.html
share/doc/libquicktime/apiref/structlqt__parameter__info__t.html
share/doc/libquicktime/apiref/structquicktime__clap__t.html
share/doc/libquicktime/apiref/structquicktime__colr__t.html
share/doc/libquicktime/apiref/structquicktime__pasp__t.html
share/doc/libquicktime/apiref/tab_b.gif
share/doc/libquicktime/apiref/tab_l.gif
share/doc/libquicktime/apiref/tab_r.gif
share/doc/libquicktime/apiref/tabs.css
share/doc/libquicktime/apiref/unionlqt__parameter__value__t.html
share/locale/de/LC_MESSAGES/libquicktime.mo