* [gentoo-commits] gentoo-x86 commit in media-libs/stk/files/stk-4.4.2: 020_all_noExamplesOrDemo.patch 010_all_removeForcedFlags.patch 030_all_sharedlib.patch 040_all_soname.patch 050_all_abiver.patch
@ 2011-01-02 14:23 99% Alexis Ballier (aballier)
0 siblings, 0 replies; 1+ results
From: Alexis Ballier (aballier) @ 2011-01-02 14:23 UTC (permalink / raw
To: gentoo-commits
aballier 11/01/02 14:23:05
Added: 020_all_noExamplesOrDemo.patch
010_all_removeForcedFlags.patch
030_all_sharedlib.patch 040_all_soname.patch
050_all_abiver.patch
Log:
version bump, by Christopher Harvey <chris@basementcode.com>, bug #309037, with some modifications and patches by me.
(Portage version: 2.2.0_alpha11/cvs/Linux x86_64)
Revision Changes Path
1.1 media-libs/stk/files/stk-4.4.2/020_all_noExamplesOrDemo.patch
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
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
Index: 020_all_noExamplesOrDemo.patch
===================================================================
--- Makefile.in~ 2010-02-04 15:52:39.000000000 -0500
+++ Makefile.in 2010-03-11 22:53:24.000000000 -0500
@@ -2,24 +2,12 @@
all :
cd src && $(MAKE)
- cd projects/demo && $(MAKE) libdemo
- cd projects/effects && $(MAKE) libeffects
- cd projects/ragamatic && $(MAKE) libragamat
- cd projects/examples && $(MAKE) -f libMakefile
clean :
-rm -f *~
cd src && $(MAKE) clean
- cd projects/demo && $(MAKE) clean
- cd projects/effects && $(MAKE) clean
- cd projects/ragamatic && $(MAKE) clean
- cd projects/examples && $(MAKE) clean
distclean: clean
-rm -rf config.log config.status autom4te.cache Makefile
cd src && $(MAKE) distclean
- cd projects/demo && $(MAKE) distclean
- cd projects/effects && $(MAKE) distclean
- cd projects/ragamatic && $(MAKE) distclean
- cd projects/examples && $(MAKE) distclean
1.1 media-libs/stk/files/stk-4.4.2/010_all_removeForcedFlags.patch
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
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
Index: 010_all_removeForcedFlags.patch
===================================================================
--- stk-4.4.2/configure.ac 2010-02-04 15:52:39.000000000 -0500
+++ configure.ac 2010-03-11 23:55:44.000000000 -0500
@@ -51,7 +51,7 @@
AC_ARG_ENABLE(debug,
[ --enable-debug = enable various debug output],
[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)],
- [AC_SUBST( cppflag, [] ) AC_SUBST( cxxflag, [-O3] ) AC_SUBST( object_path, [Release] ) AC_MSG_RESULT(no)])
+ [AC_SUBST( cppflag, [] ) AC_SUBST( cxxflag, [] ) AC_SUBST( object_path, [Release] ) AC_MSG_RESULT(no)])
# Checks for functions
if test $realtime = yes; then
@@ -63,12 +63,7 @@
CPPFLAGS="$CPPFLAGS $cppflag"
# For debugging and optimization ... overwrite default because it has both -g and -O2
-CXXFLAGS="$cxxflag"
-
-# Check compiler and use -Wall if gnu.
-if [test $GXX = "yes" ;] then
- AC_SUBST( cxxflag, [-Wall] )
-fi
+CXXFLAGS="$cxxflag $CXXFLAGS"
CXXFLAGS="$CXXFLAGS $cxxflag"
1.1 media-libs/stk/files/stk-4.4.2/030_all_sharedlib.patch
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
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
Index: 030_all_sharedlib.patch
===================================================================
Index: stk-4.4.2/src/Makefile.in
===================================================================
--- stk-4.4.2.orig/src/Makefile.in
+++ stk-4.4.2/src/Makefile.in
@@ -64,7 +64,7 @@ DEFS += -DRAWWAVE_PATH=\"$(RAWWAVES)\
%.o : ../src/include/%.cpp
$(CC) $(CFLAGS) $(DEFS) -c $(<) -o $(OBJECT_PATH)/$@
-all : $(LIBRARY)
+all : $(LIBRARY) $(SHAREDLIB).$(RELEASE)
$(LIBRARY) : $(OBJECTS)
$(RM) -f $(LIBRARY)
1.1 media-libs/stk/files/stk-4.4.2/040_all_soname.patch
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
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
Index: 040_all_soname.patch
===================================================================
Index: stk-4.4.2/src/Makefile.in
===================================================================
--- stk-4.4.2.orig/src/Makefile.in
+++ stk-4.4.2/src/Makefile.in
@@ -72,10 +72,9 @@ $(LIBRARY) : $(OBJECTS)
$(SHAREDLIB).$(RELEASE) : $(OBJECTS)
$(RM) -f $(@) $(SHAREDLIB).$(MAJOR) $(SHAREDLIB)
- $(CC) $(LDFLAGS) -fPIC -shared -o $(@) $(OBJECT_PATH)/*.o $(LIBS)
+ $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,$(SHAREDLIB).$(MAJOR) -o $(@) $(OBJECT_PATH)/*.o $(LIBS)
$(LN) -s $(SHAREDLIB).$(RELEASE) $(SHAREDLIB).$(MAJOR)
$(LN) -s $(SHAREDLIB).$(RELEASE) $(SHAREDLIB)
-# $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,$(SHAREDLIB).$(MAJOR) -o $(@) $(OBJECT_PATH)/*.o $(LIBS)
$(OBJECTS) : Stk.h
1.1 media-libs/stk/files/stk-4.4.2/050_all_abiver.patch
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
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
Index: 050_all_abiver.patch
===================================================================
Index: stk-4.4.2/src/Makefile.in
===================================================================
--- stk-4.4.2.orig/src/Makefile.in
+++ stk-4.4.2/src/Makefile.in
@@ -3,8 +3,8 @@
LIBRARY = libstk.a
SHAREDLIB = libstk.so
-MAJOR = 4
-RELEASE = 4.4.2
+MAJOR = 44
+RELEASE = 44.2
AR = ar -rsc
RM = /bin/rm
^ permalink raw reply [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2011-01-02 14:23 99% [gentoo-commits] gentoo-x86 commit in media-libs/stk/files/stk-4.4.2: 020_all_noExamplesOrDemo.patch 010_all_removeForcedFlags.patch 030_all_sharedlib.patch 040_all_soname.patch 050_all_abiver.patch Alexis Ballier (aballier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox