- unbreak plugin;
- make plugin work with mozilla-firefox so that mozilla can go out; - fix WANTLIB (from steven@); ok steven@
This commit is contained in:
martynas
parent
1b31c997dd
commit
466beaae32
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.15 2007/02/11 00:56:57 steven Exp $
|
||||
# $OpenBSD: Makefile,v 1.16 2007/05/25 16:23:51 martynas Exp $
|
||||
|
||||
COMMENT= "flash rendering library"
|
||||
DISTNAME= swfdec-0.2.2
|
||||
PKGNAME= ${DISTNAME}p3
|
||||
PKGNAME= ${DISTNAME}p4
|
||||
SHARED_LIBS= swfdec 0.0
|
||||
CATEGORIES= graphics www/mozilla
|
||||
CATEGORIES= graphics
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=swfdec/}
|
||||
|
||||
HOMEPAGE= http://swfdec.sourceforge.net/
|
||||
@ -16,10 +16,10 @@ PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
WANTLIB= ICE SM X11 Xext Xrender atk-1.0 c fontconfig \
|
||||
freetype glib-2.0 gmodule-2.0 gobject-2.0 \
|
||||
pango-1.0 pangocairo-1.0 pangoft2-1.0 \
|
||||
pthread usbhid z m cairo glitz png
|
||||
WANTLIB= X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr \
|
||||
Xrender atk-1.0 c cairo expat fontconfig freetype glib-2.0 \
|
||||
glitz gmodule-2.0 gobject-2.0 m pango-1.0 pangocairo-1.0 \
|
||||
pangoft2-1.0 png pthread usbhid z
|
||||
|
||||
MODULES= devel/gettext
|
||||
LIB_DEPENDS= SDL::devel/sdl \
|
||||
@ -29,7 +29,8 @@ LIB_DEPENDS= SDL::devel/sdl \
|
||||
|
||||
USE_X11= Yes
|
||||
USE_LIBTOOL= Yes
|
||||
CONFIGURE_STYLE=gnu
|
||||
CONFIGURE_STYLE=autoconf
|
||||
AUTOCONF_VERSION=2.57
|
||||
CONFIGURE_ARGS+=--disable-pixbuf-loader
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib" \
|
||||
@ -39,10 +40,10 @@ FLAVORS= plugin
|
||||
FLAVOR?=
|
||||
|
||||
.if ${FLAVOR:L:Mplugin}
|
||||
MOZ=mozilla
|
||||
BUILD_DEPENDS= :mozilla-devel->=1.4:www/mozilla,-devel
|
||||
WANTLIB+= ICE SM Xt
|
||||
BUILD_DEPENDS= :mozilla-firefox-devel->=2.0:www/mozilla-firefox,-devel
|
||||
CFLAGS+= -DMOZ_X11
|
||||
PORTPATH+= ${WRKDIR}/bin:/usr/bin:/bin:/usr/sbin:/sbin:${LOCALBASE}/bin:${X11BASE}/bin:${LOCALBASE}/${MOZ}
|
||||
CONFIGURE_ENV+= ENABLE_PLUGIN=Yes
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
18
graphics/swfdec/patches/patch-configure_ac
Normal file
18
graphics/swfdec/patches/patch-configure_ac
Normal file
@ -0,0 +1,18 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.1 2007/05/25 16:23:51 martynas Exp $
|
||||
--- configure.ac.orig Sun May 18 23:53:41 2003
|
||||
+++ configure.ac Thu May 24 19:15:33 2007
|
||||
@@ -84,12 +84,8 @@ if test "x$HAVE_MAD" = xyes; then
|
||||
fi
|
||||
|
||||
MOZILLA_CFLAGS=
|
||||
-if test -z "$MOZILLA_CONFIG"; then
|
||||
- AC_PATH_PROG(MOZILLA_CONFIG, mozilla-config, no)
|
||||
-fi
|
||||
-if test "x$MOZILLA_CONFIG" != "xno"; then
|
||||
- _mozilla_include_dir=`mozilla-config --cflags|sed 's/-I\(.*\) .*/\1/'`
|
||||
- MOZILLA_CFLAGS="-I$_mozilla_include_dir/plugin -I$_mozilla_include_dir/java -I$_mozilla_include_dir/nspr"
|
||||
+if test -n "$ENABLE_PLUGIN"; then
|
||||
+ MOZILLA_CFLAGS=`pkg-config firefox-plugin --cflags`
|
||||
else
|
||||
AC_MSG_WARN([mozilla-config not found. Mozilla/Netscape plugin will not be built])
|
||||
fi
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-libswfdec_mpglib_clipconv_f32_s16_h,v 1.1.1.1 2003/06/24 08:11:14 jolan Exp $
|
||||
--- libswfdec/mpglib/clipconv_f32_s16.h.orig Wed Nov 6 01:11:48 2002
|
||||
+++ libswfdec/mpglib/clipconv_f32_s16.h Sun Jun 8 04:05:14 2003
|
||||
@@ -34,7 +34,7 @@ Half integers may be rounded to either n
|
||||
$OpenBSD: patch-libswfdec_mpglib_clipconv_f32_s16_h,v 1.2 2007/05/25 16:23:51 martynas Exp $
|
||||
--- libswfdec/mpglib/clipconv_f32_s16.h.orig Wed Nov 6 09:11:48 2002
|
||||
+++ libswfdec/mpglib/clipconv_f32_s16.h Thu May 24 19:05:49 2007
|
||||
@@ -34,7 +34,7 @@ Half integers may be rounded to either nearby integer.
|
||||
//#include <sl_altivec.h>
|
||||
#define f32 float
|
||||
#define s16 short
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-player_swf_play_c,v 1.1.1.1 2003/06/24 08:11:14 jolan Exp $
|
||||
--- player/swf_play.c.orig Thu Apr 3 22:11:57 2003
|
||||
+++ player/swf_play.c Sat Jun 14 14:26:41 2003
|
||||
@@ -390,7 +390,7 @@ static void embedded (GtkPlug *plug, gpo
|
||||
$OpenBSD: patch-player_swf_play_c,v 1.2 2007/05/25 16:23:51 martynas Exp $
|
||||
--- player/swf_play.c.orig Fri Apr 4 07:11:57 2003
|
||||
+++ player/swf_play.c Thu May 24 19:05:49 2007
|
||||
@@ -390,7 +390,7 @@ static void embedded (GtkPlug *plug, gpointer data)
|
||||
static gboolean input(GIOChannel *chan, GIOCondition cond, gpointer ignored)
|
||||
{
|
||||
char *data;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-plugin_plugin_c,v 1.1.1.1 2003/06/24 08:11:14 jolan Exp $
|
||||
--- plugin/plugin.c.orig Thu Nov 21 02:51:38 2002
|
||||
+++ plugin/plugin.c Wed Jun 11 02:24:05 2003
|
||||
$OpenBSD: patch-plugin_plugin_c,v 1.2 2007/05/25 16:23:51 martynas Exp $
|
||||
--- plugin/plugin.c.orig Thu Nov 21 10:51:38 2002
|
||||
+++ plugin/plugin.c Thu May 24 19:05:49 2007
|
||||
@@ -1,8 +1,9 @@
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ $OpenBSD: patch-plugin_plugin_c,v 1.1.1.1 2003/06/24 08:11:14 jolan Exp $
|
||||
#include <sys/wait.h>
|
||||
#include <config.h>
|
||||
|
||||
@@ -240,7 +241,7 @@ static void plugin_stream_as_file(NPP in
|
||||
@@ -240,7 +241,7 @@ static void plugin_stream_as_file(NPP instance, NPStre
|
||||
|
||||
/* exported functions */
|
||||
|
||||
|
||||
@ -1,2 +1,5 @@
|
||||
@comment $OpenBSD: PFRAG.plugin,v 1.3 2004/09/15 00:50:11 espie Exp $
|
||||
@comment $OpenBSD: PFRAG.plugin,v 1.4 2007/05/25 16:23:51 martynas Exp $
|
||||
lib/mozilla-plugins/
|
||||
@lib lib/mozilla-plugins/libmozswfdec.a
|
||||
@lib lib/mozilla-plugins/libmozswfdec.la
|
||||
@lib lib/mozilla-plugins/libmozswfdec.so
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user