Attachment 84508 Details for Bug 120522 – libquicktime-1.0.2.patch

[patch] libquicktime-1.0.2.patch

libquicktime-1.0.2.patch (text/plain), 8.15 KB, created by Naram Qashat on 2008-02-11 07:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Naram Qashat

Created: 2008-02-11 07:40:01 UTC

Size: 8.15 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/multimedia/libquicktime/Makefile /kirby/shared/ports/libquicktime/Makefile
>--- /usr/ports/multimedia/libquicktime/Makefile	2007-12-18 09:50:03.000000000 -0500
>+++ /kirby/shared/ports/libquicktime/Makefile	2008-02-11 02:33:02.000000000 -0500
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	libquicktime
>-PORTVERSION=	1.0.0
>-PORTREVISION=	5
>+PORTVERSION=	1.0.2
> CATEGORIES=	multimedia
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -15,17 +14,9 @@
> MAINTAINER=	multimedia@FreeBSD.org
> COMMENT=	A library for reading and writing quicktime files
> 
>-LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis \
>-		jpeg.9:${PORTSDIR}/graphics/jpeg \
>-		png.5:${PORTSDIR}/graphics/png \
>-		dv.4:${PORTSDIR}/multimedia/libdv \
>-		avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
>-		faad.0:${PORTSDIR}/audio/faad \
>-		x264.50:${PORTSDIR}/multimedia/x264
>+LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis
> 
> USE_LDCONFIG=	yes
>-USE_GETTEXT=	yes
>-USE_GL=		yes
> USE_GNOME=	gnometarget gnomehack pkgconfig
> WANT_GNOME=	yes
> USE_GMAKE=	yes
>@@ -33,11 +24,19 @@
> USE_AUTOTOOLS=	autoconf:261
> CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
> 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} -lintl"
>-CONFIGURE_ARGS=	--disable-firewire --with-x --enable-gpl
>+CONFIGURE_ARGS=	--with-x --enable-gpl
> CFLAGS+=	-fPIC
> MAN1=		lqtplay.1
> 
> OPTIONS=	LAME "Enable Lame mp3 encoding support" Off \
>+		OPENGL "Enable OpenGL support" On \
>+		DV "Enable libdv support for digital cameras" On \
>+		JPEG "Enable JPEG support" On \
>+		PNG "Enable PNG support" On \
>+		FFMPEG "Enable FFmpeg support" On \
>+		FAAC "Enable FAAC support" Off \
>+		FAAD "Enable FAAD support" On \
>+		X264 "Enable X264 codec support" On \
> 		GTK2 "Enable Gtk+2 Frontend" Off \
> 		OPTIMIZED_CFLAGS "Enable Optimized CFLAGS" Off
> 
>@@ -49,22 +48,95 @@
> .include <bsd.port.pre.mk>
> 
> .if !defined(WITH_OPTIMIZED_CFLAGS)
>-CONFIGURE_ARGS+=--without-cpuflags
>+CONFIGURE_ARGS+=	--without-cpuflags
> .endif
> 
> .if ${HAVE_GNOME:Mgtk20}!="" && defined(WITH_GTK2)
> USE_GNOME+=	gtk20
>+CONFIGURE_ARGS+=	--with-gtk
> PLIST_SUB+=	GTK=""
> .else
>-CONFIGURE_ARGS+=--without-gtk
>+CONFIGURE_ARGS+=	--without-gtk
> PLIST_SUB+=	GTK="@comment "
> .endif
> 
>-.if defined(WITH_LAME) || exists(${LOCALBASE}/lib/libmp3lame.a)
>+.if defined(WITH_LAME)
> LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
> PLIST_SUB+=	LAME=""
>+CONFIGURE_ARGS+=	--with-lame
> .else
> PLIST_SUB+=	LAME="@comment "
>+CONFIGURE_ARGS+=	--without-lame
>+.endif
>+
>+.if !defined(WITHOUT_OPENGL)
>+USE_GL=		yes
>+CONFIGURE_ARGS+=	--with-opengl
>+.else
>+CONFIGURE_ARGS+=	--without-opengl
>+.endif
>+
>+.if !defined(WITHOUT_DV)
>+LIB_DEPENDS+=	dv.4:${PORTSDIR}/multimedia/libdv
>+PLIST_SUB+=	DV=""
>+CONFIGURE_ARGS+=	--with-libdv
>+.else
>+PLIST_SUB+=	DV="@comment "
>+CONFIGURE_ARGS+=	--without-libdv
>+.endif
>+
>+.if !defined(WITHOUT_JPEG)
>+LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
>+PLIST_SUB+=	JPEG=""
>+CONFIGURE_ARGS+=	--with-libjpeg
>+.else
>+PLIST_SUB+=	JPEG="@comment "
>+CONFIGURE_ARGS+=	--without-libjpeg
>+.endif
>+
>+.if !defined(WITHOUT_PNG)
>+LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
>+PLIST_SUB+=	PNG=""
>+CONFIGURE_ARGS+=	--with-libpng
>+.else
>+PLIST_SUB+=	PNG="@comment "
>+CONFIGURE_ARGS+=	--without-libpng
>+.endif
>+
>+.if !defined(WITHOUT_FFMPEG)
>+LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
>+PLIST_SUB+=	FFMPEG=""
>+CONFIGURE_ARGS+=	--with-ffmpeg
>+.else
>+PLIST_SUB+=	FFMPEG="@comment "
>+CONFIGURE_ARGS+=	--without-ffmpeg
>+.endif
>+
>+.if defined(WITH_FAAC)
>+LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
>+PLIST_SUB+=	FAAC=""
>+CONFIGURE_ARGS+=	--with-faac
>+.else
>+PLIST_SUB+=	FAAC="@comment "
>+CONFIGURE_ARGS+=	--without-faac
>+.endif
>+
>+.if !defined(WITHOUT_FAAD)
>+LIB_DEPENDS+=	faad.0:${PORTSDIR}/audio/faad
>+PLIST_SUB+=	FAAD=""
>+CONFIGURE_ARGS+=	--with-faad2
>+.else
>+PLIST_SUB+=	FAAD="@comment "
>+CONFIGURE_ARGS+=	--without-faad2
>+.endif
>+
>+.if !defined(WITHOUT_X264)
>+LIB_DEPENDS+=	x264.50:${PORTSDIR}/multimedia/x264
>+PLIST_SUB+=	X264=""
>+CONFIGURE_ARGS+=	--with-x264
>+.else
>+PLIST_SUB+=	X264="@comment "
>+CONFIGURE_ARGS+=	--without-x264
> .endif
> 
> .if ${MACHINE_CPU:Mmmx}
>@@ -73,6 +145,14 @@
> CONFIGURE_ARGS+=	--disable-mmx
> .endif
> 
>+.if defined(WITHOUT_NLS)
>+CONFIGURE_ARGS+=	--disable-nls
>+PLIST_SUB+=	NLS="@comment "
>+.else
>+USE_GETTEXT=	yes
>+PLIST_SUB+=	NLS=""
>+.endif
>+
> post-patch:
> 	@${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' \
> 		${WRKSRC}/plugins/audiocodec/* \
>@@ -81,8 +161,11 @@
> 	@${REINPLACE_CMD} -e 's|-DG.*_DISABLE_DEPRECATED||g' \
> 		${WRKSRC}/configure*
> 
>-post-install:
>+pre-configure:
>+	@${CHMOD} +x ${WRKSRC}/configure
>+
> .if !defined(NOPORTDOCS)
>+post-install:
> 	@${MKDIR} ${DOCSDIR}
> .for f in ${PORTDOCS}
> 	@${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}
>diff -ruN --exclude=CVS /usr/ports/multimedia/libquicktime/distinfo /kirby/shared/ports/libquicktime/distinfo
>--- /usr/ports/multimedia/libquicktime/distinfo	2007-05-28 16:32:47.000000000 -0400
>+++ /kirby/shared/ports/libquicktime/distinfo	2008-02-11 00:59:00.000000000 -0500
>@@ -1,3 +1,3 @@
>-MD5 (libquicktime-1.0.0.tar.gz) = 2f609e3ef5e760f44022f6c4b66d6a01
>-SHA256 (libquicktime-1.0.0.tar.gz) = 60c478fd81450e18a1fcf1bcee672d5cd04c4ca5871ffb709ef6a635111141a4
>-SIZE (libquicktime-1.0.0.tar.gz) = 998950
>+MD5 (libquicktime-1.0.2.tar.gz) = 4a43a44adcfbec398a91c56d1edcbdc1
>+SHA256 (libquicktime-1.0.2.tar.gz) = d3f3c9de133e0f1b5c7cedaf6e6b535ed7d583d627b5205606c62f0d3528e5b8
>+SIZE (libquicktime-1.0.2.tar.gz) = 1131731
>diff -ruN --exclude=CVS /usr/ports/multimedia/libquicktime/files/patch-doc-Makefile.in /kirby/shared/ports/libquicktime/files/patch-doc-Makefile.in
>--- /usr/ports/multimedia/libquicktime/files/patch-doc-Makefile.in	1969-12-31 19:00:00.000000000 -0500
>+++ /kirby/shared/ports/libquicktime/files/patch-doc-Makefile.in	2008-02-11 01:58:59.000000000 -0500
>@@ -0,0 +1,30 @@
>+--- doc/Makefile.in.orig	2008-01-08 17:00:56.000000000 -0500
>++++ doc/Makefile.in	2008-02-11 01:58:22.000000000 -0500
>+@@ -247,9 +247,7 @@
>+ qt4l_reading.html \
>+ qt4l_util.html \
>+ qt4l_writing.html \
>+-translatorsguide.txt \
>+-Doxyfile \
>+-apiref
>++translatorsguide.txt
>+ 
>+ all: all-am
>+ 
>+@@ -417,16 +415,6 @@
>+ 	uninstall uninstall-am
>+ 
>+ 
>+-apiref:
>+-	doxygen Doxyfile
>+-
>+-html: apiref 
>+-
>+-all: html
>+-
>+-install-data-local: html
>+-	test -z "$(DESTDIR)$(docdir)/apiref" || $(mkdir_p) "$(DESTDIR)$(docdir)/apiref"
>+-	$(INSTALL_DATA) apiref/* $(DESTDIR)$(docdir)/apiref
>+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
>+ # Otherwise a system limit (for SysV at least) may be exceeded.
>+ .NOEXPORT:
>diff -ruN --exclude=CVS /usr/ports/multimedia/libquicktime/pkg-plist /kirby/shared/ports/libquicktime/pkg-plist
>--- /usr/ports/multimedia/libquicktime/pkg-plist	2007-10-28 09:37:12.000000000 -0400
>+++ /kirby/shared/ports/libquicktime/pkg-plist	2008-02-11 02:33:28.000000000 -0500
>@@ -22,28 +22,30 @@
> lib/libquicktime.so.0
> lib/libquicktime/lqt_audiocodec.la
> lib/libquicktime/lqt_audiocodec.so
>-lib/libquicktime/lqt_dv.la
>-lib/libquicktime/lqt_dv.so
>+%%DV%%lib/libquicktime/lqt_dv.la
>+%%DV%%lib/libquicktime/lqt_dv.so
> %%LAME%%lib/libquicktime/lqt_lame.so
> %%LAME%%lib/libquicktime/lqt_lame.la
>-lib/libquicktime/lqt_faad2.la
>-lib/libquicktime/lqt_faad2.so
>-lib/libquicktime/lqt_ffmpeg.la
>-lib/libquicktime/lqt_ffmpeg.so
>-lib/libquicktime/lqt_mjpeg.la
>-lib/libquicktime/lqt_mjpeg.so
>-lib/libquicktime/lqt_png.la
>-lib/libquicktime/lqt_png.so
>+%%FAAC%%lib/libquicktime/lqt_faac.la
>+%%FAAC%%lib/libquicktime/lqt_faac.so
>+%%FAAD%%lib/libquicktime/lqt_faad2.la
>+%%FAAD%%lib/libquicktime/lqt_faad2.so
>+%%FFMPEG%%lib/libquicktime/lqt_ffmpeg.la
>+%%FFMPEG%%lib/libquicktime/lqt_ffmpeg.so
>+%%JPEG%%lib/libquicktime/lqt_mjpeg.la
>+%%JPEG%%lib/libquicktime/lqt_mjpeg.so
>+%%PNG%%lib/libquicktime/lqt_png.la
>+%%PNG%%lib/libquicktime/lqt_png.so
> lib/libquicktime/lqt_rtjpeg.la
> lib/libquicktime/lqt_rtjpeg.so
> lib/libquicktime/lqt_videocodec.la
> lib/libquicktime/lqt_videocodec.so
> lib/libquicktime/lqt_vorbis.la
> lib/libquicktime/lqt_vorbis.so
>-lib/libquicktime/lqt_x264.la
>-lib/libquicktime/lqt_x264.so
>+%%X264%%lib/libquicktime/lqt_x264.la
>+%%X264%%lib/libquicktime/lqt_x264.so
> libdata/pkgconfig/libquicktime.pc
> share/aclocal/lqt.m4
>-share/locale/de/LC_MESSAGES/libquicktime.mo
>+%%NLS%%share/locale/de/LC_MESSAGES/libquicktime.mo
> @dirrm lib/libquicktime
> @dirrm include/lqt

Actions: View | Diff

Attachments on bug 120522: 84508