SOURCES: gplflash2-link.patch - readded includedir fix
qboosh
qboosh at pld-linux.org
Mon Nov 14 13:25:22 CET 2005
Author: qboosh Date: Mon Nov 14 12:25:21 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- readded includedir fix
---- Files affected:
SOURCES:
gplflash2-link.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/gplflash2-link.patch
diff -u SOURCES/gplflash2-link.patch:1.4 SOURCES/gplflash2-link.patch:1.5
--- SOURCES/gplflash2-link.patch:1.4 Sun Nov 13 01:05:46 2005
+++ SOURCES/gplflash2-link.patch Mon Nov 14 13:25:16 2005
@@ -1,7 +1,6 @@
-diff -urbBN gplflash2.org/player/Makefile.am gplflash2/player/Makefile.am
---- gplflash2.org/player/Makefile.am 2005-09-30 19:55:04.000000000 +0200
-+++ gplflash2/player/Makefile.am 2005-11-13 00:44:01.870058500 +0100
-@@ -1,7 +1,6 @@
+--- gplflash2/player/Makefile.am.orig 2005-09-30 19:55:04.000000000 +0200
++++ gplflash2/player/Makefile.am 2005-11-14 12:09:44.000000000 +0100
+@@ -1,14 +1,13 @@
bin_PROGRAMS = flashplayer
-flashplayerdir = .
@@ -10,6 +9,14 @@
flashplayer_SOURCES= \
flashplayer.cc
+
+
+ flashplayer_LDFLAGS = $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FT2_LIBS) $(GL_LIBS) $(SDL_LIBS) $(XML_LIBS)
+-flashplayer_includedir = $(includedir)
++flashplayer_includedir = $(includedir)
+ flashplayer_CXXFLAGS = $(FT2_CFLAGS) $(X_CFLAGS)
+ flashplayer_LDADD = ../lib/libflash2.la $(LIBFFMPEG)
+ AM_CPPFLAGS = -I$(top_srcdir)
diff -urbBN gplflash2.org/plugins/mozilla/Makefile.am gplflash2/plugins/mozilla/Makefile.am
--- gplflash2.org/plugins/mozilla/Makefile.am 2005-09-30 19:55:04.000000000 +0200
+++ gplflash2/plugins/mozilla/Makefile.am 2005-11-13 00:57:12.915495750 +0100
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/gplflash2-link.patch?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list