[SCM] aeolus/master: Update 01-makefile.patch, drop unneeded 02-rename_plugin_shlibs.patch:

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Apr 13 16:15:27 UTC 2011


The following commit has been merged in the master branch:
commit 57bd3bdc9371e45294d6f818dd75270c7ec56dcd
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Apr 13 18:13:28 2011 +0200

    Update 01-makefile.patch, drop unneeded 02-rename_plugin_shlibs.patch:
    
    - Install aeolus_*.so into /usr/lib/aeolus, they are provided for
      internal use only.

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index 71b9440..508ea44 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -1,33 +1,32 @@
 Author: Alessio Treglia <quadrispro at ubuntu.com>
-Description: Add DESTDIR, adjust PREFIX and append SONAME to the libraries.
+Description: Add DESTDIR and adjust PREFIX envvars.
  Plus, fix FTBFS with binutils-gold.
  Disable -march-native to fix FTBFS.
  Add -pthread to the linking flags.
+ Install aeolus_*.so binaries into /usr/lib/aeolus since they are provided
+ for internal use only; inform aeolus about this change by passing the
+ proper value of the path from which it'll load the private libs.
 Bug: http://bugs.debian.org/553630
 Bug: http://bugs.debian.org/578278
 ---
- source/Makefile |   30 ++++++++++++++++++------------
- 1 file changed, 18 insertions(+), 12 deletions(-)
+ source/Makefile |   23 +++++++++++------------
+ 1 file changed, 11 insertions(+), 12 deletions(-)
 
 --- aeolus.orig/source/Makefile
 +++ aeolus/source/Makefile
-@@ -15,20 +15,23 @@
+@@ -15,20 +15,18 @@
  #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  
  
 -PREFIX = /usr/local
 -SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
 +PREFIX = /usr
-+#SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
-+DESTDIR=
  LIBDIR = lib$(SUFFIX)
  VERSION = 0.8.4
  DISTDIR = aeolus-$(VERSION)
- CPPFLAGS += -O3 -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DLIBDIR=\"$(PREFIX)/$(LIBDIR)\"
+-CPPFLAGS += -O3 -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DLIBDIR=\"$(PREFIX)/$(LIBDIR)\"
 -CPPFLAGS += -march=native
-+#CPPFLAGS += -march=native
-+MAJ = 0
-+REL = 0.0
++CPPFLAGS += -O3 -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DLIBDIR=\"$(PREFIX)/$(LIBDIR)/aeolus\"
  
  all:	aeolus aeolus_x11.so aeolus_txt.so
  
@@ -39,7 +38,7 @@ Bug: http://bugs.debian.org/578278
  aeolus: LDFLAGS += -L$(PREFIX)/$(LIBDIR)
  aeolus:	$(AEOLUS_O)
  	g++ $(LDFLAGS) -o $@ $(AEOLUS_O) $(LDLIBS)
-@@ -41,10 +44,10 @@ $(AEOLUS_O):
+@@ -41,7 +39,7 @@ $(AEOLUS_O):
  XIFACE_O =	styles.o mainwin.o midiwin.o audiowin.o instrwin.o editwin.o midimatrix.o \
  		multislider.o functionwin.o xiface.o addsynth.o
  aeolus_x11.so:	CPPFLAGS += -fpic -D_REENTRANT -I/usr/X11R6/include -I/usr/include/freetype2
@@ -47,12 +46,8 @@ Bug: http://bugs.debian.org/578278
 +aeolus_x11.so:	LDLIBS += -pthread -lclthreads -lclxclient -lXft -lX11
  aeolus_x11.so:	LDFLAGS += -shared -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR)
  aeolus_x11.so: $(XIFACE_O) $(LIBCLX)
--	g++ $(LDFLAGS) -o $@ $(XIFACE_O) $(LDLIBS)
-+	g++ $(LDFLAGS) -Wl,-soname=$(@).$(MAJ) -o $(@).$(MAJ).$(REL) $(XIFACE_O) $(LDLIBS)
- 
- $(XIFACE_O):
- -include $(XIFACE_O:%.o=%.d)
-@@ -52,20 +55,23 @@ $(XIFACE_O):
+ 	g++ $(LDFLAGS) -o $@ $(XIFACE_O) $(LDLIBS)
+@@ -52,20 +50,21 @@ $(XIFACE_O):
  
  TIFACE_O =	tiface.o
  aeolus_txt.so:	CPPFLAGS += -fpic -D_REENTRANT
@@ -61,7 +56,7 @@ Bug: http://bugs.debian.org/578278
  aeolus_txt.so:	LDFLAGS += -shared -L$(PREFIX)/$(LIBDIR)
  aeolus_txt.so: $(TIFACE_O)
 -	g++ $(LDFLAGS) -o $@ $(TIFACE_O) $(LDLIBS)
-+	g++ $(LDFLAGS) -Wl,-soname=$(@).$(MAJ) -o $(@).$(MAJ).$(REL) $(TIFACE_O) $(LDLIBS)
++	g++ $(LDFLAGS) -o $(@) $(TIFACE_O) $(LDLIBS)
  
  $(TIFACE_O):
  -include $(TIFACE_O:%.o=%.d)
@@ -72,13 +67,11 @@ Bug: http://bugs.debian.org/578278
 -	install -Dm 755 aeolus_x11.so $(DESTDIR)$(PREFIX)/$(LIBDIR)/aeolus_x11.so
 -	install -Dm 755 aeolus_txt.so $(DESTDIR)$(PREFIX)/$(LIBDIR)/aeolus_txt.so
 -	/sbin/ldconfig $(PREFIX)/$(LIBDIR)
-+	/usr/bin/install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)
++	/usr/bin/install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)/aeolus
 +	/usr/bin/install -d $(DESTDIR)$(PREFIX)/bin
 +	/usr/bin/install -m 755 aeolus $(DESTDIR)$(PREFIX)/bin
-+	/usr/bin/install -m 755 aeolus_x11.so.$(MAJ).$(REL) $(DESTDIR)$(PREFIX)/$(LIBDIR)
-+	ln -s aeolus_x11.so.$(MAJ).$(REL) $(DESTDIR)$(PREFIX)/$(LIBDIR)/aeolus_x11.so.$(MAJ)
-+	/usr/bin/install -m 755 aeolus_txt.so.$(MAJ).$(REL) $(DESTDIR)$(PREFIX)/$(LIBDIR)
-+	ln -s aeolus_txt.so.$(MAJ).$(REL) $(DESTDIR)$(PREFIX)/$(LIBDIR)/aeolus_txt.so.$(MAJ)
++	/usr/bin/install -m 755 aeolus_x11.so $(DESTDIR)$(PREFIX)/$(LIBDIR)/aeolus
++	/usr/bin/install -m 755 aeolus_txt.so $(DESTDIR)$(PREFIX)/$(LIBDIR)/aeolus
  
  
  clean:
diff --git a/debian/patches/02-rename_plugin_shlibs.patch b/debian/patches/02-rename_plugin_shlibs.patch
deleted file mode 100644
index 7b5400f..0000000
--- a/debian/patches/02-rename_plugin_shlibs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Autor: Alessio Treglia <quadrispro at ubuntu.com>
-Description: Plugins have been renamed, fix the search path.
-Bug: http://bugs.debian.org/581714
----
- source/main.cc |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- aeolus.orig/source/main.cc
-+++ aeolus/source/main.cc
-@@ -193,8 +193,8 @@ int main (int ac, char *av [])
- 
-     if (mlockall (MCL_CURRENT | MCL_FUTURE)) fprintf (stderr, "Warning: memory lock failed.\n");
- 
--    if (t_opt) sprintf (s, "%s/aeolus_txt.so", LIBDIR);
--    else       sprintf (s, "%s/aeolus_x11.so", LIBDIR);
-+    if (t_opt) sprintf (s, "%s/aeolus_txt.so.0", LIBDIR);
-+    else       sprintf (s, "%s/aeolus_x11.so.0", LIBDIR);
-     so_handle = dlopen (s, RTLD_NOW);
-     if (! so_handle)
-     {
diff --git a/debian/patches/series b/debian/patches/series
index 5e34b3d..d3b72df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01-makefile.patch
-02-rename_plugin_shlibs.patch

-- 
aeolus packaging



More information about the pkg-multimedia-commits mailing list