Attachment 64255 Details for Bug 95605 – gnash.patch

[patch] gnash.patch

gnash.patch (text/plain), 6.96 KB, created by Dmitry Marakasov on 2006-04-11 00:10:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2006-04-11 00:10:11 UTC

Size: 6.96 KB

patch

obsolete

>diff -ruN gnash.old/Makefile gnash/Makefile
>--- gnash.old/Makefile	Sun Apr  2 01:07:31 2006
>+++ gnash/Makefile	Tue Apr 11 02:42:34 2006
>@@ -7,100 +7,51 @@
> 
> PORTNAME=	gnash
> PORTVERSION=	0.7
>+PORTREVISION=	1
> CATEGORIES=	graphics
>-MASTER_SITES=	http://www.gnu.org/software/gnash/releases/
>-DISTNAME=	${PORTNAME}-20051226
>+MASTER_SITES=	${MASTER_SITE_LOCAL}
>+DISTNAME=	${PORTNAME}-20060407
> 
> MAINTAINER=	amdmi3@mail.ru
> COMMENT=	GNU Flash movie player
> 
> LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
>-		jpeg.9:${PORTSDIR}/graphics/jpeg
>+		jpeg.9:${PORTSDIR}/graphics/jpeg \
>+		ogg.5:${PORTSDIR}/audio/libogg \
>+		gtkglext-x11-1.0.2:${PORTSDIR}/x11-toolkits/gtkglext \
>+		gstreamer-0.8.5:${PORTSDIR}/multimedia/gstreamer
>+BUILD_DEPENDS=	${LOCALBASE}/bin/xml2-config:${PORTSDIR}/textproc/libxml2
> 
>-USE_X_PREFIX=	yes
>-USE_GNOME=	gnomehier
>-USE_SDL=	sdl mixer
> USE_BZIP2=	yes
> USE_GL=		yes
> USE_GMAKE=	yes
>-USE_REINPLACE=	yes
>+USE_GNOME=	gnomehier gtk20 glib20 atk pango pkgconfig
>+USE_SDL=	sdl mixer
>+USE_X_PREFIX=	yes
> GNU_CONFIGURE=	yes
>-#INSTALLS_OMF=	yes
>-USE_GCC=	3.4+
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-0.7
>+PANGO_VERSION=	1.0
>+GSTREAMER_VERSION=	0.8
>+PLUGIN_DIR=	${PREFIX}/lib/browser_plugins
> 
> CPPFLAGS=	`${SDL_CONFIG} --cflags` -I${X11BASE}/include
> LDFLAGS=	`${SDL_CONFIG} --libs` -L${X11BASE}/lib -Wl,--rpath,${PREFIX}/lib/gnash
> 
> CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
>-CONFIGURE_ARGS=	--program-prefix=''
>-
>-INSTALLS_SHLIB=	yes
>-LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/gnash
> 
>-MAN1=		gnash.1
>+CONFIGURE_ARGS=	--with-sdl-incl="${LOCALBASE}/include/SDL11" --with-pango-incl="${X11BASE}/include/pango-${PANGO_VERSION}" \
>+		--with-pango-lib="${X11BASE}/lib" --with-gstreamer-incl="${X11BASE}/include/gstreamer-${GSTREAMER_VERSION}" \
>+		--with-gstreamer-lib="${X11BASE}/lib" --libdir="${PREFIX}/lib/gnash" --with-plugindir=${PLUGIN_DIR}
> 
>-# As the project was just recently announced, firefox plugin doesn't work
>-# correctly yet. You can still try it with specifying WITH_FIREFOX=yes as
>-# make parameter - feel free to mail reports (preferrably of success) and
>-# your ideas to port maintainer.
>-# See also http://lists.gnu.org/archive/html/gnash/
>-
>-OPTIONS=	XML "Enable support for xml and xmlsocket" off
>-#		FIREFOX "Build firefox plugin" off
>-
>-.include <bsd.port.pre.mk>
>-
>-.if defined(WITH_FIREFOX)
>-BUILD_DEPENDS+=		${X11BASE}/bin/firefox-config:${PORTSDIR}/www/firefox
>-CONFIGURE_ARGS+=	--enable-plugin
>-CPPFLAGS+=		`firefox-config --cflags`
>-LDFLAGS+=		`firefox-config --libs`
>-PLIST_SUB=		PLUGIN:=""
>-.else
>-CONFIGURE_ARGS+=	--disable-reader
>-PLIST_SUB=		PLUGIN:="@comment "
>-.endif
>-
>-.if defined(WITH_XML)
>-BUILD_DEPENDS+=		${LOCALBASE}/bin/xml2-config:${PORTSDIR}/textproc/libxml2
>-CPPFLAGS+=		`xml2-config --cflags`
>-LDFLAGS+=		`xml2-config --libs`
>-.else
>-CONFIGURE_ARGS+=	--disable-xml
>-.endif
>-
>-post-extract:
>-	@${FIND} ${WRKSRC} -name "*.cpp" -o -name "*.h" | \
>-		${XARGS} ${REINPLACE_CMD} -e "s|$$(${PRINTF} '\r')||g"
>+WRKSRC=		${WRKDIR}/${PORTNAME}-0.7
> 
> post-patch:
>-	@${REINPLACE_CMD} -e '/INCLUDES/ s|$$(srcdir)||' ${WRKSRC}/libgeometry/Makefile.in ${WRKSRC}/libbase/Makefile.in
>-	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/libbase/dlmalloc.c ${WRKSRC}/libbase/dlmalloc.h
>-	@${REINPLACE_CMD} -e '/APPLE_CC/ s|^.*$$|#if 0|' ${WRKSRC}/libbase/utility.cpp
>-	@${REINPLACE_CMD} -e '/cd doc/ s|^.*$$|	@true|; /DIRS/ s/ doc//' ${WRKSRC}/Makefile.in
>-	@${REINPLACE_CMD} -e '/^include_HEADERS/ s|^|#|' ${WRKSRC}/Makefile.in
>-	@${REINPLACE_CMD} -e '/FIREFOX_PLUGINS=.*FIREFOX_LIBS/ s|^.*$$|FIREFOX_PLUGINS=${X11BASE}/lib/browser_plugins|' ${WRKSRC}/configure
>-.if !defined(WITH_FIREFOX)
>-	@${REINPLACE_CMD} -e 's|firefox-config|firefox-config1|g' ${WRKSRC}/configure
>-.endif
>-
>-.if defined(WITH_FIREFOX)
>-pre-install:
>-	${MKDIR} ${PREFIX}/lib/browser_plugins
>-.endif
>-
>-post-install:
>-	${INSTALL_MAN} ${WRKSRC}/doc/C/gnash.1 ${PREFIX}/man/man1
>-	${MKDIR} ${PREFIX}/share/gnome/omf/gnash
>-	${INSTALL_DATA} ${WRKSRC}/doc/C/gnash.omf ${PREFIX}/share/gnome/omf/gnash
>-.if !defined(NOPORTDOCS)
>-	${MKDIR} ${DOCSDIR}/images
>-.for i in gnash.html gnash.pdf gnash.xml legal.xml
>-	${INSTALL_DATA} ${WRKSRC}/doc/C/${i} ${DOCSDIR}
>-.endfor
>-	${INSTALL_DATA} ${WRKSRC}/doc/C/images/* ${DOCSDIR}/images
>-.endif
>+	@${REINPLACE_CMD} -e 's|-lSDL$[ "]$|`${SDL_CONFIG} --libs`\1|' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e 's|SDL/|SDL11/|' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e 's|libpangopango-x11|libpango|g' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e '/Check whether --with-pango_lib/,/Atk/ s|$${version}|${PANGO_VERSION}|g' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e 's|libgstreamergstreamer-x11|libgstreamer|g' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e 's|gstreamer/gstreamergl.h|gst/gst.h|g' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e '/Check whether --with-gstreamer_lib/,/Gtk GL/ s|$${version}|${GSTREAMER_VERSION}|g' ${WRKSRC}/configure
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -ruN gnash.old/distinfo gnash/distinfo
>--- gnash.old/distinfo	Sat Jan 14 23:38:18 2006
>+++ gnash/distinfo	Tue Apr 11 02:42:34 2006
>@@ -1,3 +1,3 @@
>-MD5 (gnash-20051226.tar.bz2) = 16d3261d0ec22be7cc738e30b42dc9ac
>-SHA256 (gnash-20051226.tar.bz2) = 49a1e958d1cf62e8cda1605abeb61b7924f3f0bb5978f78ff08d657243263350
>-SIZE (gnash-20051226.tar.bz2) = 742001
>+MD5 (gnash-20060407.tar.bz2) = 60eb3b2aecb3409752923987a739c9d3
>+SHA256 (gnash-20060407.tar.bz2) = e260a478038bae2689e63b74fcd9db111459aa5228720aaca6bbb823d6a2c22c
>+SIZE (gnash-20060407.tar.bz2) = 3719044
>diff -ruN gnash.old/pkg-plist gnash/pkg-plist
>--- gnash.old/pkg-plist	Sat Jan 14 23:38:18 2006
>+++ gnash/pkg-plist	Tue Apr 11 02:42:34 2006
>@@ -1,26 +1,30 @@
> bin/gnash
> bin/gparser
> bin/gprocessor
>-lib/gnash/libbase.a
>-lib/gnash/libbase.la
>-lib/gnash/libbase.so
>-lib/gnash/libbase.so.0
>-lib/gnash/libgeometry.a
>-lib/gnash/libgeometry.la
>-lib/gnash/libgeometry.so
>-lib/gnash/libgeometry.so.0
>-lib/gnash/libserver.a
>-lib/gnash/libserver.la
>-lib/gnash/libserver.so
>-lib/gnash/libserver.so.0
>-%%PLUGIN:%%lib/browser_plugins/libgnash.so
>-share/gnome/omf/gnash/gnash.omf
>-%%PORTDOCS%%%%DOCSDIR%%/gnash.html
>-%%PORTDOCS%%%%DOCSDIR%%/gnash.pdf
>-%%PORTDOCS%%%%DOCSDIR%%/gnash.xml
>-%%PORTDOCS%%%%DOCSDIR%%/legal.xml
>-%%PORTDOCS%%%%DOCSDIR%%/images/car_crash.png
>+lib/browser_plugins/libgnashplugin.so
>+lib/gnash/libgnashasobjs.a
>+lib/gnash/libgnashasobjs.la
>+lib/gnash/libgnashasobjs.so
>+lib/gnash/libgnashasobjs.so.0
>+lib/gnash/libgnashbackend.a
>+lib/gnash/libgnashbackend.la
>+lib/gnash/libgnashbackend.so
>+lib/gnash/libgnashbackend.so.0
>+lib/gnash/libgnashbase.a
>+lib/gnash/libgnashbase.la
>+lib/gnash/libgnashbase.so
>+lib/gnash/libgnashbase.so.0
>+lib/gnash/libgnashgeo.a
>+lib/gnash/libgnashgeo.la
>+lib/gnash/libgnashgeo.so
>+lib/gnash/libgnashgeo.so.0
>+lib/gnash/libgnashserver.a
>+lib/gnash/libgnashserver.la
>+lib/gnash/libgnashserver.so
>+lib/gnash/libgnashserver.so.0
>+lib/gnash/libmozsdk.a
>+lib/gnash/libmozsdk.la
>+lib/gnash/libmozsdk.so
>+lib/gnash/libmozsdk.so.0
> @dirrm lib/gnash
>-@dirrm share/gnome/omf/gnash
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%
>+@dirrmtry lib/browser_plugins

Actions: View | Diff

Attachments on bug 95605: 64255