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

Unbreak after the x264 update (problem first noticed by naddy@, no

Browse Source 
cookies for me).

Dependency improvements (x264 and doxygen) and whitespace cleanups
from Brad.

DOXYGEN_ENCODE_PATH_STRIP=${WRKSRC} trick pointed out by simon@
(tested with two builds using different WRKOBJDIRs).


[kili@petunia:libquicktime]$ head -30 libquicktime.diff
Unbreak after the x264 update (problem first noticed by naddy@, no
cookies for me).

Dependency improvements (x264 and doxygen) and whitespace cleanups
from Brad.

DOXYGEN_ENCODE_PATH_STRIP=${WRKSRC} trick pointed out by simon@
(tested with two builds using different WRKOBJDIRs).

ok jasper
This commit is contained in:
kili 2009-04-29 21:22:14 +00:00
parent 26e7ec7114
commit 2e97914e7f
8 changed files with 72 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
multimedia/libquicktime/Makefile
View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.16 2009/03/04 20:21:57 jasper Exp $ # $OpenBSD: Makefile,v 1.17 2009/04/29 21:22:14 kili Exp $
# $FreeBSD: ports/multimedia/libquicktime/Makefile,v 1.19 2004/03/16 04:23:53 edwin Exp $ # $FreeBSD: ports/multimedia/libquicktime/Makefile,v 1.19 2004/03/16 04:23:53 edwin Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
COMMENT= library for reading and writing quicktime files COMMENT= library for reading and writing quicktime files
DISTNAME= libquicktime-1.0.2 DISTNAME= libquicktime-1.1.1
PKGNAME= ${DISTNAME}p2
CATEGORIES= multimedia CATEGORIES= multimedia
SHARED_LIBS= quicktime 3.0 SHARED_LIBS= quicktime 4.0
HOMEPAGE= http://libquicktime.sourceforge.net/ HOMEPAGE= http://libquicktime.sourceforge.net/
@ -17,30 +16,36 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
WANTLIB += GL ICE SM X11 Xau Xaw Xcomposite Xcursor Xdamage Xdmcp WANTLIB= GL ICE SM X11 Xau Xaw Xcomposite Xcursor \
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xt Xv a52 atk-1.0 Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr \
WANTLIB += c cairo expat faac faad fontconfig freetype gio-2.0 Xrender Xt Xv a52 atk-1.0 c cairo expat \
WANTLIB += glib-2.0 glitz gmodule-2.0 gobject-2.0 m ogg ossaudio faac faad fontconfig freetype gio-2.0 \
WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 glib-2.0 glitz gmodule-2.0 gobject-2.0 m \
WANTLIB += pthread theora x264 z ogg ossaudio pango-1.0 pangocairo-1.0 \
pangoft2-1.0 pcre pixman-1 pthread theora \
z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libquicktime/} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libquicktime/}
MODULES= devel/gettext MODULES= devel/gettext
LIB_DEPENDS= vorbis.>=3,vorbisfile.>=4,vorbisenc.>=2::audio/libvorbis \ BUILD_DEPENDS= :doxygen-*:devel/doxygen
jpeg.>=9::graphics/jpeg \ LIB_DEPENDS= avcodec.>=11,avutil.>=5,swscale.>=1::graphics/ffmpeg \
png.>=4::graphics/png \
dv.>=4::multimedia/libdv \ dv.>=4::multimedia/libdv \
gtk-x11-2.0.>=800.8,gdk-x11-2.0.>=800.8,gdk_pixbuf-2.0.>=800.8::x11/gtk+2 \
jpeg.>=9::graphics/jpeg \
mp3lame::audio/lame \ mp3lame::audio/lame \
avcodec.>=11,avutil.>=5,swscale.>=1::graphics/ffmpeg \ png.>=4::graphics/png \
gtk-x11-2.0.>=800.8,gdk-x11-2.0.>=800.8,gdk_pixbuf-2.0.>=800.8::x11/gtk+2 vorbis.>=3,vorbisfile.>=4,vorbisenc.>=2::audio/libvorbis \
x264::multimedia/x264
VMEM_WARNING= Yes VMEM_WARNING= Yes
USE_X11= Yes USE_X11= Yes
USE_LIBTOOL= Yes USE_LIBTOOL= Yes
LIBTOOL_FLAGS+= --tag=disable-static LIBTOOL_FLAGS+= --tag=disable-static
MAKE_ENV= DOXYGEN_ENCODE_PATH_STRIP=${WRKSRC}
CONFIGURE_STYLE= gnu CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng -I${X11BASE}/include" \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
@ -48,6 +53,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng -
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-gpl \ --enable-gpl \
--with-libdv \
--without-alsa --without-alsa
.include <bsd.port.mk> .include <bsd.port.mk>

10
multimedia/libquicktime/distinfo
View File

@ -1,5 +1,5 @@
MD5 (libquicktime-1.0.2.tar.gz) = SkOkStz77DmKkcVtHty9wQ== MD5 (libquicktime-1.1.1.tar.gz) = iN+DikULbGdogZ1FuswJJg==
RMD160 (libquicktime-1.0.2.tar.gz) = ilm1yMb3jXfhET6c6oXwG4h1ZAs= RMD160 (libquicktime-1.1.1.tar.gz) = 0Ci3xh0hjeiRA9MiUZQhYH6IzXA=
SHA1 (libquicktime-1.0.2.tar.gz) = UWu5GveoNm07olCQiSlAV1ri1/o= SHA1 (libquicktime-1.1.1.tar.gz) = E2Zve4LYBFoD6SWWbPgJhnSBQEE=
SHA256 (libquicktime-1.0.2.tar.gz) = 0/PJ3hM+DxtcfO2vbmtTXtfVg9YntSBWBsYvDTUo5bg= SHA256 (libquicktime-1.1.1.tar.gz) = kO+hqDYTNoBmnKx0O3JmCHIK2POq3Ntx/x4p5RC9DRM=
SIZE (libquicktime-1.0.2.tar.gz) = 1131731 SIZE (libquicktime-1.1.1.tar.gz) = 1009816

65
multimedia/libquicktime/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.7 2008/07/09 02:13:01 jakemsr Exp $ $OpenBSD: patch-configure,v 1.8 2009/04/29 21:22:14 kili Exp $
--- configure.orig Tue Jan 8 14:00:53 2008 --- configure.orig Wed Dec 17 12:13:49 2008
+++ configure Sat Jun 21 12:16:30 2008 +++ configure Thu Apr 16 21:58:48 2009
@@ -24861,7 +24861,7 @@ fi @@ -25174,7 +25174,7 @@ fi
VORBIS_LIBS="-L$prefix/lib" VORBIS_LIBS="-L$prefix/lib"
fi fi
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.7 2008/07/09 02:13:01 jakemsr Exp $
VORBISFILE_LIBS="-lvorbisfile" VORBISFILE_LIBS="-lvorbisfile"
VORBISENC_LIBS="-lvorbisenc" VORBISENC_LIBS="-lvorbisenc"
@@ -25076,11 +25076,11 @@ if test "x$with_lame" != "xno"; then @@ -25389,11 +25389,11 @@ if test "x$with_lame" != "xno"; then
OLD_CFLAGS=$CFLAGS OLD_CFLAGS=$CFLAGS
OLD_LIBS=$LIBS OLD_LIBS=$LIBS
@ -26,30 +26,39 @@ $OpenBSD: patch-configure,v 1.7 2008/07/09 02:13:01 jakemsr Exp $
{ echo "$as_me:$LINENO: checking for lame" >&5 { echo "$as_me:$LINENO: checking for lame" >&5
@@ -27562,7 +27562,7 @@ cat >>conftest.$ac_ext <<_ACEOF @@ -27956,7 +27956,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
#include <stdio.h> -#include <ffmpeg/avcodec.h>
- #include <ffmpeg/avcodec.h> +#include <libavcodec/avcodec.h>
+ #include <libavcodec/avcodec.h> int
int main() main ()
{ {
FILE * output; @@ -27982,7 +27982,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
@@ -27728,7 +27728,7 @@ cat >>conftest.$ac_ext <<_ACEOF test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- found_header="true";AVCODEC_HEADER="<ffmpeg/avcodec.h>"
+ found_header="true";AVCODEC_HEADER="<libavcodec/avcodec.h>"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -28258,7 +28258,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */ /* end confdefs.h. */
#include <stdio.h> -#include <ffmpeg/avcodec.h>
- #include <ffmpeg/avcodec.h> +#include <libavcodec/avcodec.h>
+ #include <libavcodec/avcodec.h> int
int main() main ()
{ {
FILE * output; @@ -28284,7 +28284,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
@@ -27893,7 +27893,7 @@ cat >>conftest.$ac_ext <<_ACEOF test -z "$ac_c_werror_flag" ||
/* end confdefs.h. */ test ! -s conftest.err
} && test -s conftest.$ac_objext; then
#include <stdio.h> - found_header="true";AVCODEC_HEADER="<ffmpeg/avcodec.h>"
- #include <ffmpeg/avcodec.h> + found_header="true";AVCODEC_HEADER="<libavcodec/avcodec.h>"
+ #include <libavcodec/avcodec.h> else
int main() echo "$as_me: failed program was:" >&5
{ sed 's/^/| /' conftest.$ac_ext >&5
FILE * output;

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

@ -1,12 +0,0 @@
$OpenBSD: patch-plugins_ffmpeg_ffmpeg_h,v 1.1 2008/07/09 02:13:01 jakemsr Exp $
--- plugins/ffmpeg/ffmpeg.h.orig Sat Jun 21 12:40:00 2008
+++ plugins/ffmpeg/ffmpeg.h Sat Jun 21 12:40:12 2008
@@ -26,7 +26,7 @@
#define QUICKTIME_FFMPEG_H
#include <quicktime/qtprivate.h>
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
void quicktime_init_video_codec_ffmpeg(quicktime_video_map_t *vtrack,
AVCodec *encoder, AVCodec *decoder);

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

@ -1,12 +0,0 @@
$OpenBSD: patch-plugins_ffmpeg_params_c,v 1.1 2008/07/09 02:13:01 jakemsr Exp $
--- plugins/ffmpeg/params.c.orig Sat Jun 21 12:40:39 2008
+++ plugins/ffmpeg/params.c Sat Jun 21 12:40:50 2008
@@ -24,7 +24,7 @@
#include "lqt_private.h"
#include "params.h"
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
#include <string.h>
typedef struct

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

@ -1,12 +0,0 @@
$OpenBSD: patch-plugins_ffmpeg_video_c,v 1.1 2008/07/09 02:13:01 jakemsr Exp $
--- plugins/ffmpeg/video.c.orig Sat Jun 21 21:02:38 2008
+++ plugins/ffmpeg/video.c Sat Jun 21 21:02:53 2008
@@ -32,7 +32,7 @@
#define LOG_DOMAIN "ffmpeg_video"
#ifdef HAVE_LIBSWSCALE
-#include <swscale.h>
+#include <libswscale/swscale.h>
#endif
// Enable interlaced encoding (experimental)

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

@ -1,7 +1,7 @@
$OpenBSD: patch-utils_lqtplay_c,v 1.4 2008/01/26 02:02:50 jakemsr Exp $ $OpenBSD: patch-utils_lqtplay_c,v 1.5 2009/04/29 21:22:14 kili Exp $
--- utils/lqtplay.c.orig Sat Nov 10 16:38:12 2007 --- utils/lqtplay.c.orig Sat Aug 2 20:40:00 2008
+++ utils/lqtplay.c Sat Jan 19 21:06:11 2008 +++ utils/lqtplay.c Thu Apr 16 21:55:32 2009
@@ -937,7 +937,7 @@ static void qt_init(FILE *fp, char *filename) @@ -978,7 +978,7 @@ static void qt_init(FILE *fp, char *filename)
qt_hasaudio = 0;} qt_hasaudio = 0;}
} }
else { else {

9
multimedia/libquicktime/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2008/07/09 02:13:01 jakemsr Exp $ @comment $OpenBSD: PLIST,v 1.8 2009/04/29 21:22:14 kili Exp $
@bin bin/libquicktime_config @bin bin/libquicktime_config
bin/lqt-config bin/lqt-config
@bin bin/lqt_transcode @bin bin/lqt_transcode
@ -53,8 +53,8 @@ share/doc/libquicktime/
share/doc/libquicktime/apiref/ share/doc/libquicktime/apiref/
share/doc/libquicktime/apiref/annotated.html share/doc/libquicktime/apiref/annotated.html
share/doc/libquicktime/apiref/colormodels_8h-source.html share/doc/libquicktime/apiref/colormodels_8h-source.html
share/doc/libquicktime/apiref/dir_53292056a2aca918f7f93eaa35ab24bb.html share/doc/libquicktime/apiref/dir_2c23d5540d2a668b0550fa40aa20e858.html
share/doc/libquicktime/apiref/dir_ac6d6cfc5ba22cfe0e9bc6c52513f95c.html share/doc/libquicktime/apiref/dir_4abde00ac62fef88430208d846181602.html
share/doc/libquicktime/apiref/dirs.html share/doc/libquicktime/apiref/dirs.html
share/doc/libquicktime/apiref/doxygen.css share/doc/libquicktime/apiref/doxygen.css
share/doc/libquicktime/apiref/doxygen.png share/doc/libquicktime/apiref/doxygen.png
@ -83,6 +83,7 @@ share/doc/libquicktime/apiref/group__multichannel.html
share/doc/libquicktime/apiref/group__text.html share/doc/libquicktime/apiref/group__text.html
share/doc/libquicktime/apiref/group__text__decode.html share/doc/libquicktime/apiref/group__text__decode.html
share/doc/libquicktime/apiref/group__text__encode.html share/doc/libquicktime/apiref/group__text__encode.html
share/doc/libquicktime/apiref/group__timecodes.html
share/doc/libquicktime/apiref/group__video.html share/doc/libquicktime/apiref/group__video.html
share/doc/libquicktime/apiref/group__video__codecs.html share/doc/libquicktime/apiref/group__video__codecs.html
share/doc/libquicktime/apiref/group__video__decode.html share/doc/libquicktime/apiref/group__video__decode.html
@ -95,7 +96,7 @@ share/doc/libquicktime/apiref/lqt__codecinfo_8h-source.html
share/doc/libquicktime/apiref/modules.html share/doc/libquicktime/apiref/modules.html
share/doc/libquicktime/apiref/quicktime_8h-source.html share/doc/libquicktime/apiref/quicktime_8h-source.html
share/doc/libquicktime/apiref/quicktime_8h.html share/doc/libquicktime/apiref/quicktime_8h.html
share/doc/libquicktime/apiref/structlqt__codec__info__t.html share/doc/libquicktime/apiref/structlqt__codec__info__s.html
share/doc/libquicktime/apiref/structlqt__parameter__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__clap__t.html
share/doc/libquicktime/apiref/structquicktime__colr__t.html share/doc/libquicktime/apiref/structquicktime__colr__t.html