[SCM] libgig/master: Add patch to fix install path.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Wed Nov 23 21:53:03 UTC 2016
The following commit has been merged in the master branch:
commit d1d2276ac3be0ad8d29e6a8e7007ee471d0cd1e1
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Wed Nov 23 22:27:21 2016 +0100
Add patch to fix install path.
diff --git a/debian/patches/05-fix-include-dir.patch b/debian/patches/05-fix-include-dir.patch
new file mode 100644
index 0000000..6c7de64
--- /dev/null
+++ b/debian/patches/05-fix-include-dir.patch
@@ -0,0 +1,111 @@
+Description: install libs to /usr/lib/<multiarch>.
+Drop extra /libgig subdir
+Author: Jaromír Mikeš <mira.mikes at seznam.cz>
+Forwarded: no
+
+Index: libgig/akai.pc.in
+===================================================================
+--- libgig.orig/akai.pc.in
++++ libgig/akai.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@/libgig
+-includedir=@includedir@/libgig
++libdir=@libdir@
++includedir=@includedir@
+
+ Name: akai
+ Description: C++ library for accessing AKAI disk images
+Index: libgig/gig.pc.in
+===================================================================
+--- libgig.orig/gig.pc.in
++++ libgig/gig.pc.in
+@@ -1,7 +1,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@/libgig
+-includedir=@includedir@/libgig
++libdir=@libdir@
++includedir=@includedir@
+
+ Name: gig
+ Description: C++ library for accessing Gigasampler/GigaStudio, DLS, SoundFont and KORG sound files
+Index: libgig/src/Makefile.am
+===================================================================
+--- libgig.orig/src/Makefile.am
++++ libgig/src/Makefile.am
+@@ -1,9 +1,9 @@
+ # to prevent compile errors on some systems
+ AM_CXXFLAGS = -pedantic -Wreturn-type
+
+-pkglib_LTLIBRARIES = libgig.la libakai.la
++lib_LTLIBRARIES = libgig.la libakai.la
+
+-libgigincludedir = $(includedir)/libgig
++libgigincludedir = $(includedir)
+ libgiginclude_HEADERS = RIFF.h DLS.h SF.h gig.h Korg.h
+ libgig_la_SOURCES = RIFF.cpp DLS.cpp SF.cpp gig.cpp Korg.cpp
+ libgig_la_LDFLAGS = -no-undefined -version-info @LIBGIG_SHARED_VERSION_INFO@ @LIBGIG_SHLIB_VERSION_ARG@
+@@ -14,7 +14,7 @@ if MAC
+ libgig_la_LDFLAGS += -framework CoreFoundation
+ endif
+
+-libakaiincludedir = $(includedir)/libgig
++libakaiincludedir = $(includedir)
+ libakaiinclude_HEADERS = Akai.h
+ libakai_la_SOURCES = Akai.cpp
+ libakai_la_LDFLAGS = -no-undefined -version-info @LIBAKAI_SHARED_VERSION_INFO@ @LIBAKAI_SHLIB_VERSION_ARG@
+Index: libgig/src/Makefile.in
+===================================================================
+--- libgig.orig/src/Makefile.in
++++ libgig/src/Makefile.in
+@@ -385,14 +385,14 @@ top_srcdir = @top_srcdir@
+ # to prevent compile errors on some systems
+ AM_CXXFLAGS = -pedantic -Wreturn-type
+ pkglib_LTLIBRARIES = libgig.la libakai.la
+-libgigincludedir = $(includedir)/libgig
++libgigincludedir = $(includedir)
+ libgiginclude_HEADERS = RIFF.h DLS.h SF.h gig.h Korg.h
+ libgig_la_SOURCES = RIFF.cpp DLS.cpp SF.cpp gig.cpp Korg.cpp
+ libgig_la_LDFLAGS = -no-undefined -version-info \
+ @LIBGIG_SHARED_VERSION_INFO@ @LIBGIG_SHLIB_VERSION_ARG@ \
+ $(am__append_1)
+ @WIN32_TRUE at libgig_la_LIBADD = -lrpcrt4
+-libakaiincludedir = $(includedir)/libgig
++libakaiincludedir = $(includedir)
+ libakaiinclude_HEADERS = Akai.h
+ libakai_la_SOURCES = Akai.cpp
+ libakai_la_LDFLAGS = -no-undefined -version-info \
+Index: libgig/libgig.spec.in
+===================================================================
+--- libgig.orig/libgig.spec.in
++++ libgig/libgig.spec.in
+@@ -80,20 +80,20 @@ if [ -d $RPM_BUILD_ROOT ]; then rm -rf $
+ %defattr(-,root,root)
+ %doc AUTHORS COPYING ChangeLog NEWS README TODO
+ %{prefix}/bin/*
+-%{prefix}/lib/libgig/libgig.so*
+-%{prefix}/lib/libgig/libakai.so*
++%{prefix}/lib/libgig.so*
++%{prefix}/lib/libakai.so*
+ %{prefix}/share/man/man1/*
+
+ %files devel
+ %defattr(-,root,root)
+ %doc doc/html/*
+-%{prefix}/lib/libgig/libgig.a
+-%{prefix}/lib/libgig/libgig.la
++%{prefix}/lib/libgig.a
++%{prefix}/lib/libgig.la
+ %{prefix}/lib/pkgconfig/gig.pc
+-%{prefix}/lib/libgig/libakai.a
+-%{prefix}/lib/libgig/libakai.la
++%{prefix}/lib/libakai.a
++%{prefix}/lib/libakai.la
+ %{prefix}/lib/pkgconfig/akai.pc
+-%{prefix}/include/libgig/*
++%{prefix}/include/*
+
+ %changelog
+ * Tue Jul 14 2015 Christian Schoenebeck <cuse at users.sourceforge.net>
diff --git a/debian/patches/series b/debian/patches/series
index cdf1f2d..0ced3da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
02-manpages.patch
03-deletechuncklist.patch
04-spelling.patch
+05-fix-include-dir.patch
--
libgig packaging
More information about the pkg-multimedia-commits
mailing list