| 1 |
aballier 11/01/02 14:23:05 |
| 2 |
|
| 3 |
Added: 020_all_noExamplesOrDemo.patch |
| 4 |
010_all_removeForcedFlags.patch |
| 5 |
030_all_sharedlib.patch 040_all_soname.patch |
| 6 |
050_all_abiver.patch |
| 7 |
Log: |
| 8 |
version bump, by Christopher Harvey <chris@××××××××××××.com>, bug #309037, with some modifications and patches by me. |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha11/cvs/Linux x86_64) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.1 media-libs/stk/files/stk-4.4.2/020_all_noExamplesOrDemo.patch |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/stk/files/stk-4.4.2/020_all_noExamplesOrDemo.patch?rev=1.1&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/stk/files/stk-4.4.2/020_all_noExamplesOrDemo.patch?rev=1.1&content-type=text/plain |
| 17 |
|
| 18 |
Index: 020_all_noExamplesOrDemo.patch |
| 19 |
=================================================================== |
| 20 |
--- Makefile.in~ 2010-02-04 15:52:39.000000000 -0500 |
| 21 |
+++ Makefile.in 2010-03-11 22:53:24.000000000 -0500 |
| 22 |
@@ -2,24 +2,12 @@ |
| 23 |
|
| 24 |
all : |
| 25 |
cd src && $(MAKE) |
| 26 |
- cd projects/demo && $(MAKE) libdemo |
| 27 |
- cd projects/effects && $(MAKE) libeffects |
| 28 |
- cd projects/ragamatic && $(MAKE) libragamat |
| 29 |
- cd projects/examples && $(MAKE) -f libMakefile |
| 30 |
|
| 31 |
clean : |
| 32 |
-rm -f *~ |
| 33 |
cd src && $(MAKE) clean |
| 34 |
- cd projects/demo && $(MAKE) clean |
| 35 |
- cd projects/effects && $(MAKE) clean |
| 36 |
- cd projects/ragamatic && $(MAKE) clean |
| 37 |
- cd projects/examples && $(MAKE) clean |
| 38 |
|
| 39 |
distclean: clean |
| 40 |
-rm -rf config.log config.status autom4te.cache Makefile |
| 41 |
cd src && $(MAKE) distclean |
| 42 |
- cd projects/demo && $(MAKE) distclean |
| 43 |
- cd projects/effects && $(MAKE) distclean |
| 44 |
- cd projects/ragamatic && $(MAKE) distclean |
| 45 |
- cd projects/examples && $(MAKE) distclean |
| 46 |
|
| 47 |
|
| 48 |
|
| 49 |
|
| 50 |
1.1 media-libs/stk/files/stk-4.4.2/010_all_removeForcedFlags.patch |
| 51 |
|
| 52 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/stk/files/stk-4.4.2/010_all_removeForcedFlags.patch?rev=1.1&view=markup |
| 53 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/stk/files/stk-4.4.2/010_all_removeForcedFlags.patch?rev=1.1&content-type=text/plain |
| 54 |
|
| 55 |
Index: 010_all_removeForcedFlags.patch |
| 56 |
=================================================================== |
| 57 |
--- stk-4.4.2/configure.ac 2010-02-04 15:52:39.000000000 -0500 |
| 58 |
+++ configure.ac 2010-03-11 23:55:44.000000000 -0500 |
| 59 |
@@ -51,7 +51,7 @@ |
| 60 |
AC_ARG_ENABLE(debug, |
| 61 |
[ --enable-debug = enable various debug output], |
| 62 |
[AC_SUBST( cppflag, ["-D_STK_DEBUG_ -D__RTAUDIO_DEBUG__ -D__RTMIDI_DEBUG__"] ) AC_SUBST( cxxflag, ["-g"] ) AC_SUBST( object_path, [Debug] ) AC_MSG_RESULT(yes)], |
| 63 |
- [AC_SUBST( cppflag, [] ) AC_SUBST( cxxflag, [-O3] ) AC_SUBST( object_path, [Release] ) AC_MSG_RESULT(no)]) |
| 64 |
+ [AC_SUBST( cppflag, [] ) AC_SUBST( cxxflag, [] ) AC_SUBST( object_path, [Release] ) AC_MSG_RESULT(no)]) |
| 65 |
|
| 66 |
# Checks for functions |
| 67 |
if test $realtime = yes; then |
| 68 |
@@ -63,12 +63,7 @@ |
| 69 |
CPPFLAGS="$CPPFLAGS $cppflag" |
| 70 |
|
| 71 |
# For debugging and optimization ... overwrite default because it has both -g and -O2 |
| 72 |
-CXXFLAGS="$cxxflag" |
| 73 |
- |
| 74 |
-# Check compiler and use -Wall if gnu. |
| 75 |
-if [test $GXX = "yes" ;] then |
| 76 |
- AC_SUBST( cxxflag, [-Wall] ) |
| 77 |
-fi |
| 78 |
+CXXFLAGS="$cxxflag $CXXFLAGS" |
| 79 |
|
| 80 |
CXXFLAGS="$CXXFLAGS $cxxflag" |
| 81 |
|
| 82 |
|
| 83 |
|
| 84 |
|
| 85 |
1.1 media-libs/stk/files/stk-4.4.2/030_all_sharedlib.patch |
| 86 |
|
| 87 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/stk/files/stk-4.4.2/030_all_sharedlib.patch?rev=1.1&view=markup |
| 88 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/stk/files/stk-4.4.2/030_all_sharedlib.patch?rev=1.1&content-type=text/plain |
| 89 |
|
| 90 |
Index: 030_all_sharedlib.patch |
| 91 |
=================================================================== |
| 92 |
Index: stk-4.4.2/src/Makefile.in |
| 93 |
=================================================================== |
| 94 |
--- stk-4.4.2.orig/src/Makefile.in |
| 95 |
+++ stk-4.4.2/src/Makefile.in |
| 96 |
@@ -64,7 +64,7 @@ DEFS += -DRAWWAVE_PATH=\"$(RAWWAVES)\ |
| 97 |
%.o : ../src/include/%.cpp |
| 98 |
$(CC) $(CFLAGS) $(DEFS) -c $(<) -o $(OBJECT_PATH)/$@ |
| 99 |
|
| 100 |
-all : $(LIBRARY) |
| 101 |
+all : $(LIBRARY) $(SHAREDLIB).$(RELEASE) |
| 102 |
|
| 103 |
$(LIBRARY) : $(OBJECTS) |
| 104 |
$(RM) -f $(LIBRARY) |
| 105 |
|
| 106 |
|
| 107 |
|
| 108 |
1.1 media-libs/stk/files/stk-4.4.2/040_all_soname.patch |
| 109 |
|
| 110 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/stk/files/stk-4.4.2/040_all_soname.patch?rev=1.1&view=markup |
| 111 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/stk/files/stk-4.4.2/040_all_soname.patch?rev=1.1&content-type=text/plain |
| 112 |
|
| 113 |
Index: 040_all_soname.patch |
| 114 |
=================================================================== |
| 115 |
Index: stk-4.4.2/src/Makefile.in |
| 116 |
=================================================================== |
| 117 |
--- stk-4.4.2.orig/src/Makefile.in |
| 118 |
+++ stk-4.4.2/src/Makefile.in |
| 119 |
@@ -72,10 +72,9 @@ $(LIBRARY) : $(OBJECTS) |
| 120 |
|
| 121 |
$(SHAREDLIB).$(RELEASE) : $(OBJECTS) |
| 122 |
$(RM) -f $(@) $(SHAREDLIB).$(MAJOR) $(SHAREDLIB) |
| 123 |
- $(CC) $(LDFLAGS) -fPIC -shared -o $(@) $(OBJECT_PATH)/*.o $(LIBS) |
| 124 |
+ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,$(SHAREDLIB).$(MAJOR) -o $(@) $(OBJECT_PATH)/*.o $(LIBS) |
| 125 |
$(LN) -s $(SHAREDLIB).$(RELEASE) $(SHAREDLIB).$(MAJOR) |
| 126 |
$(LN) -s $(SHAREDLIB).$(RELEASE) $(SHAREDLIB) |
| 127 |
-# $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,$(SHAREDLIB).$(MAJOR) -o $(@) $(OBJECT_PATH)/*.o $(LIBS) |
| 128 |
|
| 129 |
$(OBJECTS) : Stk.h |
| 130 |
|
| 131 |
|
| 132 |
|
| 133 |
|
| 134 |
1.1 media-libs/stk/files/stk-4.4.2/050_all_abiver.patch |
| 135 |
|
| 136 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/stk/files/stk-4.4.2/050_all_abiver.patch?rev=1.1&view=markup |
| 137 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/stk/files/stk-4.4.2/050_all_abiver.patch?rev=1.1&content-type=text/plain |
| 138 |
|
| 139 |
Index: 050_all_abiver.patch |
| 140 |
=================================================================== |
| 141 |
Index: stk-4.4.2/src/Makefile.in |
| 142 |
=================================================================== |
| 143 |
--- stk-4.4.2.orig/src/Makefile.in |
| 144 |
+++ stk-4.4.2/src/Makefile.in |
| 145 |
@@ -3,8 +3,8 @@ |
| 146 |
|
| 147 |
LIBRARY = libstk.a |
| 148 |
SHAREDLIB = libstk.so |
| 149 |
-MAJOR = 4 |
| 150 |
-RELEASE = 4.4.2 |
| 151 |
+MAJOR = 44 |
| 152 |
+RELEASE = 44.2 |
| 153 |
|
| 154 |
AR = ar -rsc |
| 155 |
RM = /bin/rm |
Archives