SOURCES: gplflash2-link.patch - updated

[arekm]

Author: arekm                        Date: Sat Nov 12 23:50:06 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

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

---- Diffs:

================================================================
Index: SOURCES/gplflash2-link.patch
diff -u SOURCES/gplflash2-link.patch:1.2 SOURCES/gplflash2-link.patch:1.3
--- SOURCES/gplflash2-link.patch:1.2	Sun Aug 28 16:48:28 2005
+++ SOURCES/gplflash2-link.patch	Sun Nov 13 00:50:01 2005
@@ -1,39 +1,38 @@
---- 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 @@
+diff -urNbB 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 @@
+ bin_PROGRAMS = flashplayer
+ 
+-flashplayerdir = .
+-flashplayer_HEADERS = ../lib/swf.hh
++flashplayer_include_HEADERS = ../lib/swf.hh
+ 
+ flashplayer_SOURCES=	\
+ 	flashplayer.cc
+diff -urNbB 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:45:12.102447750 +0100
+@@ -13,18 +13,13 @@
  OPTIMIZER=$(OPTFLAGS)
  SHARED=-shared
  
 -libnpflash_la_LIBADD = ../../lib/libflash2.la
-+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_LIBADD = ../../lib/libflash2.la $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FT2_LIBS) $(GL_LIBS) $(LIBFFMPE
++G) $(SDL_LIBS) $(XML_LIBS) -lXt
+ libnpflash_la_SOURCES = flash_interface.cc plugin.c npunix.c \
+ 	npapi.h npupp.h flash_interface.hh \
+ 	jritypes.h jri_md.h jri.h
 -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 = $(FT2_CFLAGS) $(X_CFLAGS)
 -libnpflash_la_LDFLAGS = $(LIBJPEG) $(LIBZ) $(X_LIBS) $(FT2_LIBS) $(GL_LIBS) $(LIBFFMPEG) $(SDL_LIBS) $(XML_LIBS)
--
++libnpflash_la_LDFLAGS = -avoid-version
+ AM_CPPFLAGS = -I$(top_srcdir)
+ 
 -install-pluginLTLIBRARIES: $(plugin_LIBRARIES)
--	mkdir -p $(PLUGIN_DIR)
--	cp $(srcdir)/.libs/libnpflash.so.0.0.0 $(PLUGIN_DIR)/libnpflash.so
+-	$(mkinstalldirs) $(DESTDIR)/$(PLUGIN_DIR)
+-	cp .libs/libnpflash.so.0.0.0 $(DESTDIR)/$(PLUGIN_DIR)/libnpflash.so
 -
 -uninstall-pluginLTLIBRARIES: $(plugin_LIBRARIES)
--	rm -f $(PLUGIN_DIR)/libnpflash.so
-+libnpflash_la_LDFLAGS = -avoid-version
---- 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
- 
--flashplayerdir = .
--flashplayer_HEADERS = ../lib/swf.hh
-+flashplayer_include_HEADERS = ../lib/swf.hh
- 
- 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)
+-	rm -f $(DESTDIR)/$(PLUGIN_DIR)/libnpflash.so
================================================================

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