* [gentoo-commits] gentoo-x86 commit in media-sound/milkytracker/files: milkytracker-0.90.80-external_zlib.patch
@ 2009-07-22 6:22 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2009-07-22 6:22 UTC (permalink / raw
To: gentoo-commits
ssuominen 09/07/22 06:22:49
Added: milkytracker-0.90.80-external_zlib.patch
Log:
Use system zlib wrt #251229.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Revision Changes Path
1.1 media-sound/milkytracker/files/milkytracker-0.90.80-external_zlib.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/milkytracker/files/milkytracker-0.90.80-external_zlib.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/milkytracker/files/milkytracker-0.90.80-external_zlib.patch?rev=1.1&content-type=text/plain
Index: milkytracker-0.90.80-external_zlib.patch
===================================================================
diff -ur milkytracker-0.90.80.orig/src/compression/Makefile.am milkytracker-0.90.80/src/compression/Makefile.am
--- milkytracker-0.90.80.orig/src/compression/Makefile.am 2008-01-25 00:44:27.000000000 +0200
+++ milkytracker-0.90.80/src/compression/Makefile.am 2009-07-22 09:17:49.000000000 +0300
@@ -1,5 +1,5 @@
noinst_LIBRARIES = libcompression.a
-libcompression_a_SOURCES = zlib/generic/adler32.cpp zlib/generic/compress.cpp zlib/generic/deflate.cpp zlib/generic/infback.cpp zlib/generic/inffast.cpp zlib/generic/inflate.cpp zlib/generic/inftrees.cpp zlib/generic/uncompr.cpp zlib/generic/crc32.cpp zlib/generic/trees.cpp zlib/generic/zutil.cpp zziplib/generic/dir.cpp zziplib/generic/err.cpp zziplib/generic/fetch.cpp zziplib/generic/file.cpp zziplib/generic/fseeko.cpp zziplib/generic/info.cpp zziplib/generic/plugin.cpp zziplib/generic/stat.cpp zziplib/generic/zip.cpp zziplib/MyIO.cpp PP20.cpp ZipExtractor.cpp
+libcompression_a_SOURCES = zziplib/generic/dir.cpp zziplib/generic/err.cpp zziplib/generic/fetch.cpp zziplib/generic/file.cpp zziplib/generic/fseeko.cpp zziplib/generic/info.cpp zziplib/generic/plugin.cpp zziplib/generic/stat.cpp zziplib/generic/zip.cpp zziplib/MyIO.cpp PP20.cpp ZipExtractor.cpp
noinst_HEADERS = zlib/generic/crc32.h zlib/generic/deflate.h zlib/generic/inffast.h zlib/generic/inffixed.h zlib/generic/inflate.h zlib/generic/inftrees.h zlib/generic/trees.h zlib/generic/zconf.h zlib/generic/zlib.h zlib/generic/zutil.h zziplib/generic/zzip.h zziplib/generic/zzip___debug.h zziplib/generic/zzip___dirent.h zziplib/generic/zzip___fnmatch.h zziplib/generic/zzip___hints.h zziplib/generic/zzip___mmap.h zziplib/generic/zzip__config.h zziplib/generic/zzip__msvc.h zziplib/generic/zzip_autoconf.h zziplib/generic/zzip_conf.h zziplib/generic/zzip_fetch.h zziplib/generic/zzip_file.h zziplib/generic/zzip_format.h zziplib/generic/zzip_fseeko.h zziplib/generic/zzip_info.h zziplib/generic/zzip_lib.h zziplib/generic/zzip_plugin.h zziplib/generic/zzip_stdint.h zziplib/generic/zzip_types.h zziplib/MyIO.h PP20.h ZipExtractor.h
-INCLUDES = -I$(top_srcdir)/src/milkyplay -I$(top_srcdir)/src/ppui -I$(top_srcdir)/src/ppui/osinterface/posix/ -I$(top_srcdir)/src/compression/zziplib -I$(top_srcdir)/src/compression/zziplib/generic -I$(top_srcdir)/src/compression/zlib/generic
+INCLUDES = -I$(top_srcdir)/src/milkyplay -I$(top_srcdir)/src/ppui -I$(top_srcdir)/src/ppui/osinterface/posix/ -I$(top_srcdir)/src/compression/zziplib -I$(top_srcdir)/src/compression/zziplib/generic
#INCLUDES = -I../ppui -I../ppui/osinterface -I../ppui/osinterface/posix
diff -ur milkytracker-0.90.80.orig/src/tracker/Makefile.am milkytracker-0.90.80/src/tracker/Makefile.am
--- milkytracker-0.90.80.orig/src/tracker/Makefile.am 2008-04-13 01:45:11.000000000 +0300
+++ milkytracker-0.90.80/src/tracker/Makefile.am 2009-07-22 09:19:24.000000000 +0300
@@ -7,5 +7,5 @@
-I$(top_srcdir)/src/tracker -I$(top_srcdir)/src/midi/posix -I../midi/rtmidi \
-I$(top_srcdir)/src/ppui/osinterface -I$(top_srcdir)/src/ppui/osinterface/sdl \
-I$(top_srcdir)/src/ppui/osinterface/posix -I$(top_srcdir)/src/ppui/sdl -Isdl
-milkytracker_LDADD = $(top_builddir)/src/milkyplay/libmilkyplay.a $(top_builddir)/src/ppui/osinterface/libosinterface.a $(top_builddir)/src/ppui/libppui.a $(top_builddir)/src/ppui/osinterface/libosinterface.a $(top_builddir)/src/fx/libfx.a $(top_builddir)/src/compression/libcompression.a $(RTMIDI) $(SDL_LIBS)
-DIST_EXTRA = carbon/Carbon_Definitions.h carbon/Carbon_main.cpp carbon/InfoPlist.strings carbon/KeyTranslation.cpp carbon/KeyTranslation.h carbon/PreferencesDialog.cpp carbon/PreferencesDialog.h carbon/iGetKeys.cpp carbon/iGetKeys.h win32/PreferencesDialog.cpp win32/PreferencesDialog.h win32/ThreadTimer.cpp win32/ThreadTimer.h win32/Win32_main.cpp win32/Win32_resource.h win32/Win32_resources.rc wince/ButtonMapper.cpp wince/ButtonMapper.h wince/VirtualKeyToScanCodeTable.cpp wince/VirtualKeyToScanCodeTable.h wince/WaitStateThread.cpp wince/WaitStateThread.h wince/WinCE_NEWRES.H wince/WinCE_ThreadTimer.cpp wince/WinCE_ThreadTimer.h wince/WinCE_main.cpp wince/WinCE_main.h wince/WinCE_resource.h
\ No newline at end of file
+milkytracker_LDADD = -lz $(top_builddir)/src/milkyplay/libmilkyplay.a $(top_builddir)/src/ppui/osinterface/libosinterface.a $(top_builddir)/src/ppui/libppui.a $(top_builddir)/src/ppui/osinterface/libosinterface.a $(top_builddir)/src/fx/libfx.a $(top_builddir)/src/compression/libcompression.a $(RTMIDI) $(SDL_LIBS)
+DIST_EXTRA = carbon/Carbon_Definitions.h carbon/Carbon_main.cpp carbon/InfoPlist.strings carbon/KeyTranslation.cpp carbon/KeyTranslation.h carbon/PreferencesDialog.cpp carbon/PreferencesDialog.h carbon/iGetKeys.cpp carbon/iGetKeys.h win32/PreferencesDialog.cpp win32/PreferencesDialog.h win32/ThreadTimer.cpp win32/ThreadTimer.h win32/Win32_main.cpp win32/Win32_resource.h win32/Win32_resources.rc wince/ButtonMapper.cpp wince/ButtonMapper.h wince/VirtualKeyToScanCodeTable.cpp wince/VirtualKeyToScanCodeTable.h wince/WaitStateThread.cpp wince/WaitStateThread.h wince/WinCE_NEWRES.H wince/WinCE_ThreadTimer.cpp wince/WinCE_ThreadTimer.h wince/WinCE_main.cpp wince/WinCE_main.h wince/WinCE_resource.h
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-sound/milkytracker/files: milkytracker-0.90.80-external_zlib.patch
@ 2009-07-22 6:53 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2009-07-22 6:53 UTC (permalink / raw
To: gentoo-commits
ssuominen 09/07/22 06:53:33
Modified: milkytracker-0.90.80-external_zlib.patch
Log:
Be more complete with the zlib remove.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Revision Changes Path
1.2 media-sound/milkytracker/files/milkytracker-0.90.80-external_zlib.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/milkytracker/files/milkytracker-0.90.80-external_zlib.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/milkytracker/files/milkytracker-0.90.80-external_zlib.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/milkytracker/files/milkytracker-0.90.80-external_zlib.patch?r1=1.1&r2=1.2
Index: milkytracker-0.90.80-external_zlib.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/milkytracker/files/milkytracker-0.90.80-external_zlib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- milkytracker-0.90.80-external_zlib.patch 22 Jul 2009 06:22:49 -0000 1.1
+++ milkytracker-0.90.80-external_zlib.patch 22 Jul 2009 06:53:33 -0000 1.2
@@ -1,12 +1,14 @@
diff -ur milkytracker-0.90.80.orig/src/compression/Makefile.am milkytracker-0.90.80/src/compression/Makefile.am
--- milkytracker-0.90.80.orig/src/compression/Makefile.am 2008-01-25 00:44:27.000000000 +0200
-+++ milkytracker-0.90.80/src/compression/Makefile.am 2009-07-22 09:17:49.000000000 +0300
-@@ -1,5 +1,5 @@
++++ milkytracker-0.90.80/src/compression/Makefile.am 2009-07-22 09:52:08.000000000 +0300
+@@ -1,5 +1,6 @@
++#zziplib has been customized, so we can't use system copy.
noinst_LIBRARIES = libcompression.a
-libcompression_a_SOURCES = zlib/generic/adler32.cpp zlib/generic/compress.cpp zlib/generic/deflate.cpp zlib/generic/infback.cpp zlib/generic/inffast.cpp zlib/generic/inflate.cpp zlib/generic/inftrees.cpp zlib/generic/uncompr.cpp zlib/generic/crc32.cpp zlib/generic/trees.cpp zlib/generic/zutil.cpp zziplib/generic/dir.cpp zziplib/generic/err.cpp zziplib/generic/fetch.cpp zziplib/generic/file.cpp zziplib/generic/fseeko.cpp zziplib/generic/info.cpp zziplib/generic/plugin.cpp zziplib/generic/stat.cpp zziplib/generic/zip.cpp zziplib/MyIO.cpp PP20.cpp ZipExtractor.cpp
-+libcompression_a_SOURCES = zziplib/generic/dir.cpp zziplib/generic/err.cpp zziplib/generic/fetch.cpp zziplib/generic/file.cpp zziplib/generic/fseeko.cpp zziplib/generic/info.cpp zziplib/generic/plugin.cpp zziplib/generic/stat.cpp zziplib/generic/zip.cpp zziplib/MyIO.cpp PP20.cpp ZipExtractor.cpp
- noinst_HEADERS = zlib/generic/crc32.h zlib/generic/deflate.h zlib/generic/inffast.h zlib/generic/inffixed.h zlib/generic/inflate.h zlib/generic/inftrees.h zlib/generic/trees.h zlib/generic/zconf.h zlib/generic/zlib.h zlib/generic/zutil.h zziplib/generic/zzip.h zziplib/generic/zzip___debug.h zziplib/generic/zzip___dirent.h zziplib/generic/zzip___fnmatch.h zziplib/generic/zzip___hints.h zziplib/generic/zzip___mmap.h zziplib/generic/zzip__config.h zziplib/generic/zzip__msvc.h zziplib/generic/zzip_autoconf.h zziplib/generic/zzip_conf.h zziplib/generic/zzip_fetch.h zziplib/generic/zzip_file.h zziplib/generic/zzip_format.h zziplib/generic/zzip_fseeko.h zziplib/generic/zzip_info.h zziplib/generic/zzip_lib.h zziplib/generic/zzip_plugin.h zziplib/generic/zzip_stdint.h zziplib/generic/zzip_types.h zziplib/MyIO.h PP20.h ZipExtractor.h
+-noinst_HEADERS = zlib/generic/crc32.h zlib/generic/deflate.h zlib/generic/inffast.h zlib/generic/inffixed.h zlib/generic/inflate.h zlib/generic/inftrees.h zlib/generic/trees.h zlib/generic/zconf.h zlib/generic/zlib.h zlib/generic/zutil.h zziplib/generic/zzip.h zziplib/generic/zzip___debug.h zziplib/generic/zzip___dirent.h zziplib/generic/zzip___fnmatch.h zziplib/generic/zzip___hints.h zziplib/generic/zzip___mmap.h zziplib/generic/zzip__config.h zziplib/generic/zzip__msvc.h zziplib/generic/zzip_autoconf.h zziplib/generic/zzip_conf.h zziplib/generic/zzip_fetch.h zziplib/generic/zzip_file.h zziplib/generic/zzip_format.h zziplib/generic/zzip_fseeko.h zziplib/generic/zzip_info.h zziplib/generic/zzip_lib.h zziplib/generic/zzip_plugin.h zziplib/generic/zzip_stdint.h zziplib/generic/zzip_types.h zziplib/MyIO.h PP20.h ZipExtractor.h
-INCLUDES = -I$(top_srcdir)/src/milkyplay -I$(top_srcdir)/src/ppui -I$(top_srcdir)/src/ppui/osinterface/posix/ -I$(top_srcdir)/src/compression/zziplib -I$(top_srcdir)/src/compression/zziplib/generic -I$(top_srcdir)/src/compression/zlib/generic
++libcompression_a_SOURCES = zziplib/generic/dir.cpp zziplib/generic/err.cpp zziplib/generic/fetch.cpp zziplib/generic/file.cpp zziplib/generic/fseeko.cpp zziplib/generic/info.cpp zziplib/generic/plugin.cpp zziplib/generic/stat.cpp zziplib/generic/zip.cpp zziplib/MyIO.cpp PP20.cpp ZipExtractor.cpp
++noinst_HEADERS = zziplib/generic/zzip.h zziplib/generic/zzip___debug.h zziplib/generic/zzip___dirent.h zziplib/generic/zzip___fnmatch.h zziplib/generic/zzip___hints.h zziplib/generic/zzip___mmap.h zziplib/generic/zzip__config.h zziplib/generic/zzip__msvc.h zziplib/generic/zzip_autoconf.h zziplib/generic/zzip_conf.h zziplib/generic/zzip_fetch.h zziplib/generic/zzip_file.h zziplib/generic/zzip_format.h zziplib/generic/zzip_fseeko.h zziplib/generic/zzip_info.h zziplib/generic/zzip_lib.h zziplib/generic/zzip_plugin.h zziplib/generic/zzip_stdint.h zziplib/generic/zzip_types.h zziplib/MyIO.h PP20.h ZipExtractor.h
+INCLUDES = -I$(top_srcdir)/src/milkyplay -I$(top_srcdir)/src/ppui -I$(top_srcdir)/src/ppui/osinterface/posix/ -I$(top_srcdir)/src/compression/zziplib -I$(top_srcdir)/src/compression/zziplib/generic
#INCLUDES = -I../ppui -I../ppui/osinterface -I../ppui/osinterface/posix
diff -ur milkytracker-0.90.80.orig/src/tracker/Makefile.am milkytracker-0.90.80/src/tracker/Makefile.am
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-sound/milkytracker/files: milkytracker-0.90.80-external_zlib.patch
@ 2010-02-06 13:17 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-02-06 13:17 UTC (permalink / raw
To: gentoo-commits
ssuominen 10/02/06 13:17:54
Modified: milkytracker-0.90.80-external_zlib.patch
Log:
Fix building with -Wl,--as-needed wrt #294396 by Kacper Kowalik.
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Revision Changes Path
1.3 media-sound/milkytracker/files/milkytracker-0.90.80-external_zlib.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/milkytracker/files/milkytracker-0.90.80-external_zlib.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/milkytracker/files/milkytracker-0.90.80-external_zlib.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/milkytracker/files/milkytracker-0.90.80-external_zlib.patch?r1=1.2&r2=1.3
Index: milkytracker-0.90.80-external_zlib.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/milkytracker/files/milkytracker-0.90.80-external_zlib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- milkytracker-0.90.80-external_zlib.patch 22 Jul 2009 06:53:33 -0000 1.2
+++ milkytracker-0.90.80-external_zlib.patch 6 Feb 2010 13:17:54 -0000 1.3
@@ -21,5 +21,5 @@
-milkytracker_LDADD = $(top_builddir)/src/milkyplay/libmilkyplay.a $(top_builddir)/src/ppui/osinterface/libosinterface.a $(top_builddir)/src/ppui/libppui.a $(top_builddir)/src/ppui/osinterface/libosinterface.a $(top_builddir)/src/fx/libfx.a $(top_builddir)/src/compression/libcompression.a $(RTMIDI) $(SDL_LIBS)
-DIST_EXTRA = carbon/Carbon_Definitions.h carbon/Carbon_main.cpp carbon/InfoPlist.strings carbon/KeyTranslation.cpp carbon/KeyTranslation.h carbon/PreferencesDialog.cpp carbon/PreferencesDialog.h carbon/iGetKeys.cpp carbon/iGetKeys.h win32/PreferencesDialog.cpp win32/PreferencesDialog.h win32/ThreadTimer.cpp win32/ThreadTimer.h win32/Win32_main.cpp win32/Win32_resource.h win32/Win32_resources.rc wince/ButtonMapper.cpp wince/ButtonMapper.h wince/VirtualKeyToScanCodeTable.cpp wince/VirtualKeyToScanCodeTable.h wince/WaitStateThread.cpp wince/WaitStateThread.h wince/WinCE_NEWRES.H wince/WinCE_ThreadTimer.cpp wince/WinCE_ThreadTimer.h wince/WinCE_main.cpp wince/WinCE_main.h wince/WinCE_resource.h
\ No newline at end of file
-+milkytracker_LDADD = -lz $(top_builddir)/src/milkyplay/libmilkyplay.a $(top_builddir)/src/ppui/osinterface/libosinterface.a $(top_builddir)/src/ppui/libppui.a $(top_builddir)/src/ppui/osinterface/libosinterface.a $(top_builddir)/src/fx/libfx.a $(top_builddir)/src/compression/libcompression.a $(RTMIDI) $(SDL_LIBS)
++milkytracker_LDADD = $(top_builddir)/src/milkyplay/libmilkyplay.a $(top_builddir)/src/ppui/osinterface/libosinterface.a $(top_builddir)/src/ppui/libppui.a $(top_builddir)/src/ppui/osinterface/libosinterface.a $(top_builddir)/src/fx/libfx.a $(top_builddir)/src/compression/libcompression.a $(RTMIDI) $(SDL_LIBS) -lz
+DIST_EXTRA = carbon/Carbon_Definitions.h carbon/Carbon_main.cpp carbon/InfoPlist.strings carbon/KeyTranslation.cpp carbon/KeyTranslation.h carbon/PreferencesDialog.cpp carbon/PreferencesDialog.h carbon/iGetKeys.cpp carbon/iGetKeys.h win32/PreferencesDialog.cpp win32/PreferencesDialog.h win32/ThreadTimer.cpp win32/ThreadTimer.h win32/Win32_main.cpp win32/Win32_resource.h win32/Win32_resources.rc wince/ButtonMapper.cpp wince/ButtonMapper.h wince/VirtualKeyToScanCodeTable.cpp wince/VirtualKeyToScanCodeTable.h wince/WaitStateThread.cpp wince/WaitStateThread.h wince/WinCE_NEWRES.H wince/WinCE_ThreadTimer.cpp wince/WinCE_ThreadTimer.h wince/WinCE_main.cpp wince/WinCE_main.h wince/WinCE_resource.h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-02-06 13:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-22 6:53 [gentoo-commits] gentoo-x86 commit in media-sound/milkytracker/files: milkytracker-0.90.80-external_zlib.patch Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2010-02-06 13:17 Samuli Suominen (ssuominen)
2009-07-22 6:22 Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox