diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2009-09-16 18:09:52 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2009-09-16 18:09:52 +0000 |
commit | bdda8d0897b48f6f9114201ea7a6b8c1bf432e41 (patch) | |
tree | b44d97e47c51f46ca423638605dae8277f12bad1 /media-libs/libjsw | |
parent | stable x86, bug 284976 (diff) | |
download | historical-bdda8d0897b48f6f9114201ea7a6b8c1bf432e41.tar.gz historical-bdda8d0897b48f6f9114201ea7a6b8c1bf432e41.tar.bz2 historical-bdda8d0897b48f6f9114201ea7a6b8c1bf432e41.zip |
old
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'media-libs/libjsw')
-rw-r--r-- | media-libs/libjsw/Manifest | 5 | ||||
-rw-r--r-- | media-libs/libjsw/files/libjsw-1.5.5-build.patch | 114 | ||||
-rw-r--r-- | media-libs/libjsw/files/libjsw-1.5.5-gcc33.patch | 46 | ||||
-rw-r--r-- | media-libs/libjsw/files/libjsw-1.5.5-headers.patch | 9 | ||||
-rw-r--r-- | media-libs/libjsw/libjsw-1.5.5.ebuild | 59 |
5 files changed, 0 insertions, 233 deletions
diff --git a/media-libs/libjsw/Manifest b/media-libs/libjsw/Manifest index 38dad9028cd2..0e8f1be2362c 100644 --- a/media-libs/libjsw/Manifest +++ b/media-libs/libjsw/Manifest @@ -1,10 +1,5 @@ -AUX libjsw-1.5.5-build.patch 3065 RMD160 1288670ceb0b3118c5e7fa0592033a3843a23e61 SHA1 f9486aa283637486af247ab78fb0d5f595235866 SHA256 43e11096411c00f11e6d1c6c0d86a71d58fcf942bb96f8c3e4fa81aaeacba297 -AUX libjsw-1.5.5-gcc33.patch 1249 RMD160 7868e11d2f2af71d0077e62f595f6d64fe04695f SHA1 a59d46f165663e3c01d59577bab5d91326081ca9 SHA256 42eafc62248d408b5cac6c1e61554f74ea40c41014edeb56ed88d7f820d8e750 -AUX libjsw-1.5.5-headers.patch 177 RMD160 99048db9d04f7a477fb6061489870c2caa78cccc SHA1 3121c92f4d654922a432afe147abb477b96b8b19 SHA256 5971ed5f1e8d1859a49de5954172c8b40be1d8b6b1ae3207500b84a30c314f2e AUX libjsw-1.5.6-build.patch 3057 RMD160 765b3d16bb6c32767b07f0a353bd866cb81306d5 SHA1 d0f24db8053e37026fec7ca34bfef5004287cca5 SHA256 8209898b7e16de9567feb6c29096e094f68338f5454f139986ac192d79a64a83 -DIST libjsw-1.5.5.tar.bz2 317027 RMD160 bb693cdba0adc527f9f16b106a1d01cc2062e574 SHA1 3a3d3bb90fac80bac5da76deccc8623e671214b5 SHA256 43f2cc14d9caf37645ec4f06ad7de2b9fc2515cd7fdaf6dff56563bd01744c5c DIST libjsw-1.5.6.tar.bz2 322826 RMD160 37d562beb1ebde7cede53daca2ef7d9237985db6 SHA1 bef77af685d90d95cbd5878b0f3c93f834a52832 SHA256 59495f4a1c090d32977da96300d17b165ad181518e4c3ac4702d3a8c7ed7ccc3 -EBUILD libjsw-1.5.5.ebuild 1425 RMD160 e02bec88e7e3043acd63ff733a92de5b1cdc81f4 SHA1 ce36c9eec6dec48ce3c26942c8ddad16c4d8a5e3 SHA256 505d64be98240b4dd552a3b07b3babe4403bacf083e0652b71997870d348a0c0 EBUILD libjsw-1.5.6.ebuild 1343 RMD160 017bd44ba8ffb12b39b8156ff4093ba6d7fbc97c SHA1 af1f48b7f368bc9108948c932c82497afb9e3bb4 SHA256 ea5d02b004e69f01ae12543a1d17aadcaac146b1cc039ac2d89d9035ff45a482 MISC ChangeLog 2201 RMD160 477679de7ad90eaec5966ea4833d05ca4c23fe13 SHA1 d0344a4a67c1e611d429fbfe61a0ff9f0f03ae75 SHA256 1b6791667fc59f5572aa17e64f3ff5287f66177df7f3e915d0aacfa7c8fed6de MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/media-libs/libjsw/files/libjsw-1.5.5-build.patch b/media-libs/libjsw/files/libjsw-1.5.5-build.patch deleted file mode 100644 index d29eb5c7ba6f..000000000000 --- a/media-libs/libjsw/files/libjsw-1.5.5-build.patch +++ /dev/null @@ -1,114 +0,0 @@ -Search our custom $(LIB_DIRS) path before the stuff -gtk-config injects in $(LIBS). - -http://bugs.gentoo.org/94867 - -Make sure we respect CFLAGS / CXXFLAGS - ---- libjsw-1.5.5/jscalibrator/Makefile -+++ libjsw-1.5.5/jscalibrator/Makefile -@@ -59,8 +59,6 @@ - #CFLAGS = -Wall -O -g \ - # `gtk-config --cflags` - --CFLAGS = -Wall -O6 -fomit-frame-pointer -funroll-loops -ffast-math \ -- `gtk-config --cflags` - - CPPFLAGS = -D__cplusplus - -@@ -76,7 +74,7 @@ - # to the LIB line depending on what you have set in the CFLAGS line - # farther above. - # --LIBS = -ljsw `gtk-config --libs` -+LIBS := -ljsw $(shell gtk-config --libs) - - # Library Directories: - # -@@ -85,7 +83,7 @@ - # Each argument is of the format -L<dir> where <dir> is the full - # path to the directory. - # --LIB_DIRS = -+LIB_DIRS = -L../libjsw - - # Header File Directories: - # -@@ -95,7 +93,7 @@ - # Each argument is of the format -I<dir> where <dir> is the full - # path to the directory. - # --INC_DIRS = -+INC_DIRS := $(shell gtk-config --cflags) -I../libjsw - - - # ######################################################################## -@@ -117,11 +115,9 @@ - OBJ_C = $(SRC_C:.c=.o) - OBJ_CPP = $(SRC_CPP:.cpp=.o) - .c.o: -- @echo "Compiling module $*.o" -- @+$(CC) -c $*.c $(INC_DIRS) $(CFLAGS) -+ $(CC) -c $*.c $(INC_DIRS) $(CFLAGS) - .cpp.o: -- @echo "Compiling module $*.o" -- @+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS) -+ $(CPP) -c $*.cpp $(INC_DIRS) $(CXXFLAGS) $(CPPFLAGS) - - - # ######################################################################## -@@ -130,10 +126,7 @@ - $(BIN): prebuild modules postbuild - - modules: $(OBJ_C) $(OBJ_CPP) -- @echo -n "Linking modules..." -- @$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS) -- @echo -n " " -- @-$(LS) $(LSFLAGS) $(BIN) -+ $(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LDFLAGS) $(LIB_DIRS) $(LIBS) - - prebuild: - @echo "Building program \"$(BIN)\"..." ---- libjsw-1.5.5/libjsw/Makefile -+++ libjsw-1.5.5/libjsw/Makefile -@@ -51,11 +51,10 @@ - # to debug the program. - # - --CFLAGS = -Wall -O6 \ -- -fomit-frame-pointer -funroll-loops -ffast-math \ -- -finline-functions -+CFLAGS += -fPIC -+CXXFLAGS += -fPIC - --CPPFLAGS = -D__cplusplus -+CPPFLAGS += -D__cplusplus - - - # ######################################################################## -@@ -83,11 +82,9 @@ - OBJ_C = $(SRC_C:.c=.o) - OBJ_CPP = $(SRC_CPP:.cpp=.o) - .c.o: -- @echo "Compiling module $*.o" -- @+$(CC) -c $*.c $(INC) $(CFLAGS) -+ $(CC) -c $*.c $(INC) $(CFLAGS) - .cpp.o: -- @echo "Compiling module $*.o" -- @+$(CPP) -c $*.cpp $(INC) $(CFLAGS) $(CPPFLAGS) -+ $(CPP) -c $*.cpp $(INC) $(CXXFLAGS) $(CPPFLAGS) - - - # ######################################################################## -@@ -96,10 +93,7 @@ - $(LIB): prebuild modules postbuild - - modules: $(OBJ_C) $(OBJ_CPP) -- @echo -n "Linking modules..." -- @$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(LIB) $(LIBS) $(LIB_DIRS) -- @echo -n " " -- @-$(LS) $(LSFLAGS) $(LIB) -+ $(CPP) $(OBJ_C) $(OBJ_CPP) -o $(LIB) $(LDFLAGS) $(LIBS) $(LIB_DIRS) - - prebuild: - @echo "Building library \"$(LIB)\"..." diff --git a/media-libs/libjsw/files/libjsw-1.5.5-gcc33.patch b/media-libs/libjsw/files/libjsw-1.5.5-gcc33.patch deleted file mode 100644 index a7ae87607de5..000000000000 --- a/media-libs/libjsw/files/libjsw-1.5.5-gcc33.patch +++ /dev/null @@ -1,46 +0,0 @@ -Work around a gcc-3.3.x bug where redefining prototypes with different -__THROW / attribute(nonnull) markings throws an error: - -string.cpp:31: error: declaration of `char* strcasestr(const char*, const char*)' throws different exceptions -../include/string.h:46: error: than previous declaration `char* strcasestr(const char*, const char*) throw ()' - -basically we just use the glibc strcasestr() instead of the internal one. - -http://bugs.gentoo.org/show_bug.cgi?id=85780 - ---- libjsw/string.cpp -+++ libjsw/string.cpp -@@ -30,3 +30,5 @@ - #endif -+#ifndef _GNU_SOURCE - char *strcasestr(const char *haystack, const char *needle); -+#endif - int strpfx(const char *s, const char *pfx); -@@ -218,4 +220,5 @@ - * needle in haystack if found or NULL on no match. - */ -+#ifndef _GNU_SOURCE - char *strcasestr(const char *haystack, const char *needle) - { -@@ -274,6 +277,7 @@ - - return(NULL); - } -+#endif - - /* - * Checks if string pfx is a prefix of string s. ---- libjsw/disk.cpp -+++ libjsw/disk.cpp -@@ -131,11 +131,7 @@ - return(0); - - // Dan S: typecast is due to const. --#if defined(__cplusplus) || defined(c_plusplus) -- while(ISBLANK(reinterpret_cast<char>(*path))) --#else - while(ISBLANK(*path)) --#endif - path++; - - return(*path == DIR_DELIMINATOR); diff --git a/media-libs/libjsw/files/libjsw-1.5.5-headers.patch b/media-libs/libjsw/files/libjsw-1.5.5-headers.patch deleted file mode 100644 index b7deed2a4c9f..000000000000 --- a/media-libs/libjsw/files/libjsw-1.5.5-headers.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- jscalibrator/jcwidgets.c -+++ jscalibrator/jcwidgets.c -@@ -1,5 +1,6 @@ - #include <jsw.h> - #include <gtk/gtk.h> -+#include <string.h> - - #include "guiutils.h" - #include "jc.h" diff --git a/media-libs/libjsw/libjsw-1.5.5.ebuild b/media-libs/libjsw/libjsw-1.5.5.ebuild deleted file mode 100644 index 1174001748ce..000000000000 --- a/media-libs/libjsw/libjsw-1.5.5.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libjsw/libjsw-1.5.5.ebuild,v 1.7 2006/10/31 19:36:31 nyhm Exp $ - -inherit eutils multilib - -DESCRIPTION="provide a uniform API and user configuration for joysticks and game controllers" -HOMEPAGE="http://wolfpack.twu.net/libjsw/" -SRC_URI="ftp://wolfpack.twu.net/users/wolfpack/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="gtk" - -DEPEND="gtk? ( =x11-libs/gtk+-1.2* )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-build.patch - epatch "${FILESDIR}"/${P}-gcc33.patch - bunzip2 libjsw/man/* jscalibrator/jscalibrator.1.bz2 || die "bunzip failed" - cd jscalibrator - epatch "${FILESDIR}"/${P}-gcc33.patch - epatch "${FILESDIR}"/${P}-headers.patch -} - -src_compile() { - cd "${S}"/libjsw - emake || die "main build failed" - #ln -s libjsw.so.${PV} libjsw.so - - if use gtk ; then - cd "${S}"/jscalibrator - emake || die "jscalibrator failed" - fi -} - -src_install() { - insinto /usr/include - doins include/jsw.h || die "doins jsw.h failed" - - dodoc AUTHORS README - docinto jswdemos - dodoc jswdemos/* - - cd "${S}"/libjsw - dolib.so libjsw.so.${PV} || die "dolib.so" - dosym libjsw.so.${PV} /usr/$(get_libdir)/libjsw.so - doman man/* - - if use gtk ; then - cd "${S}"/jscalibrator - dobin jscalibrator || die - doman jscalibrator.1 - dohtml data/help/* - fi -} |