SOURCES: gplflash2-link.patch - updated for 20050828 snap

[qboosh]

Author: qboosh                       Date: Sun Aug 28 14:48:34 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 20050828 snap

---- Files affected:
SOURCES:
   gplflash2-link.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/gplflash2-link.patch
diff -u SOURCES/gplflash2-link.patch:1.1 SOURCES/gplflash2-link.patch:1.2
--- SOURCES/gplflash2-link.patch:1.1	Sat Jun 11 20:27:27 2005
+++ SOURCES/gplflash2-link.patch	Sun Aug 28 16:48:28 2005
@@ -1,16 +1,16 @@
---- gplflash2/plugins/mozilla/Makefile.am.orig	2005-04-24 22:51:39.000000000 +0200
-+++ gplflash2/plugins/mozilla/Makefile.am	2005-06-11 18:30:08.627104256 +0200
+--- gplflash2/plugins/mozilla/Makefile.am.orig	2005-08-28 11:31:14.000000000 +0200
++++ gplflash2/plugins/mozilla/Makefile.am	2005-08-28 15:36:07.130835376 +0200
 @@ -13,15 +13,8 @@
  OPTIMIZER=$(OPTFLAGS)
  SHARED=-shared
  
 -libnpflash_la_LIBADD = ../../lib/libflash2.la
-+libnpflash_la_LIBADD = ../../lib/libflash2.la $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FREETYPE_LIBS) $(GL_LIBS) $(LIBFFMPEG) $(LIBSDL) $(XML_LIBS) -lXt
++libnpflash_la_LIBADD = ../../lib/libflash2.la $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FT2_LIBS) $(GL_LIBS) $(LIBFFMPEG) $(SDL_LIBS) $(XML_LIBS) -lXt
  libnpflash_la_SOURCES = flash_interface.cc plugin.c npunix.c 
 -libnpflash_la_CFLAGS = -fpic -fPIC -DPIC $(OPTIMIZER) $(PLUGIN_DEFINES) -I../lib $(X_CFLAGS)
 +libnpflash_la_CFLAGS = -fPIC -DPIC $(OPTIMIZER) $(PLUGIN_DEFINES) -I../lib $(X_CFLAGS)
- libnpflash_la_CXXFLAGS = $(FREETYPE_CFLAGS)
--libnpflash_la_LDFLAGS = $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FREETYPE_LIBS) $(GL_LIBS) $(LIBFFMPEG) $(LIBSDL) $(XML_LIBS)
+ libnpflash_la_CXXFLAGS = $(FT2_CFLAGS) $(X_CFLAGS)
+-libnpflash_la_LDFLAGS = $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FT2_LIBS) $(GL_LIBS) $(LIBFFMPEG) $(SDL_LIBS) $(XML_LIBS)
 -
 -install-pluginLTLIBRARIES: $(plugin_LIBRARIES)
 -	mkdir -p $(PLUGIN_DIR)
@@ -19,8 +19,8 @@
 -uninstall-pluginLTLIBRARIES: $(plugin_LIBRARIES)
 -	rm -f $(PLUGIN_DIR)/libnpflash.so
 +libnpflash_la_LDFLAGS = -avoid-version
---- gplflash2/player/Makefile.am.orig	2005-04-24 22:51:38.000000000 +0200
-+++ gplflash2/player/Makefile.am	2005-06-11 19:08:01.235615248 +0200
+--- gplflash2/player/Makefile.am.orig	2005-08-28 11:31:14.000000000 +0200
++++ gplflash2/player/Makefile.am	2005-08-28 15:36:58.912963296 +0200
 @@ -1,13 +1,12 @@
  bin_PROGRAMS = flashplayer
  
@@ -32,8 +32,8 @@
  	flashplayer.cc
  
  
- flashplayer_LDFLAGS = $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FREETYPE_LIBS) $(GL_LIBS) $(LIBSDL) $(LIBXML2)
+ flashplayer_LDFLAGS = $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FT2_LIBS) $(GL_LIBS) $(SDL_LIBS) $(XML_LIBS)
 -flashplayer_includedir = $(includedir) 
 +flashplayer_includedir = $(includedir)
- flashplayer_CXXFLAGS = $(FREETYPE_CFLAGS)
+ flashplayer_CXXFLAGS = $(FT2_CFLAGS) $(X_CFLAGS)
  flashplayer_LDADD = ../lib/libflash2.la $(LIBFFMPEG)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/gplflash2-link.patch?r1=1.1&r2=1.2&f=u