diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2015-11-01 16:59:57 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-11-01 17:01:10 +0100 |
| commit | db52dc7b398c4615d87a9435a291742660f15c98 (patch) | |
| tree | 1eca7ae2d12db3f9f525b1c6789191f261f29e87 /freebsd/dependencies/akode/files/patch-b03-add-multilib-support.diff | |
| parent | 538764c31cd84749170a8510f95556912c3811f6 (diff) | |
| download | tde-packaging-db52dc7b398c4615d87a9435a291742660f15c98.tar.gz tde-packaging-db52dc7b398c4615d87a9435a291742660f15c98.zip | |
FreeBSD: Update for final release R14.0.2r14.0.2
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'freebsd/dependencies/akode/files/patch-b03-add-multilib-support.diff')
| -rw-r--r-- | freebsd/dependencies/akode/files/patch-b03-add-multilib-support.diff | 91 |
1 files changed, 91 insertions, 0 deletions
diff --git a/freebsd/dependencies/akode/files/patch-b03-add-multilib-support.diff b/freebsd/dependencies/akode/files/patch-b03-add-multilib-support.diff new file mode 100644 index 000000000..ee2a58b08 --- /dev/null +++ b/freebsd/dependencies/akode/files/patch-b03-add-multilib-support.diff @@ -0,0 +1,91 @@ +commit d67c4c24d28fb80653b1d499dcb7cd36284883fd +Author: François Andriot <francois.andriot@free.fr> +Date: Thu Oct 15 04:47:35 2015 +0200 + + Add multilib support + [taken from Fedora patches] + +diff --git a/akode/CMakeLists.txt b/akode/CMakeLists.txt +index 26cc5c0..b7ab6a5 100644 +--- a/akode/CMakeLists.txt ++++ b/akode/CMakeLists.txt +@@ -24,6 +24,10 @@ configure_file( akode-config.in akode-config @ONLY ) + install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/akode-config + DESTINATION ${BIN_INSTALL_DIR} ) + ++configure_file( akode.pc.in akode.pc @ONLY ) ++install( FILES ${CMAKE_CURRENT_BINARY_DIR}/akode.pc ++ DESTINATION ${PKGCONFIG_INSTALL_DIR} ) ++ + + ##### build ##################################### + +diff --git a/akode/Makefile.am b/akode/Makefile.am +index 99455d5..a30cdd8 100644 +--- a/akode/Makefile.am ++++ b/akode/Makefile.am +@@ -1,3 +1,8 @@ + bin_SCRIPTS = akode-config + + SUBDIRS= lib plugins akodeplay ++ ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = akode.pc ++ ++EXTRA_DIST = akode.pc.in +diff --git a/akode/akode-config.in b/akode/akode-config.in +index b4263be..d1d8457 100644 +--- a/akode/akode-config.in ++++ b/akode/akode-config.in +@@ -15,9 +15,8 @@ EOH + } + + prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@ ++akode_libs="`pkg-config --libs akode`" ++akode_cflags="`pkg-config --cflags akode`" + + flags="" + +@@ -29,10 +28,10 @@ while test $# -gt 0 + do + case $1 in + --libs) +- flags="$flags -L$libdir -lakode" ++ flags="$flags $akode_libs" + ;; + --cflags) +- flags="$flags -I$includedir" ++ flags="$flags $akode_cflags" + ;; + --version) + echo 2.0.2 +diff --git a/akode/akode.pc.in b/akode/akode.pc.in +new file mode 100644 +index 0000000..d17b2ea +--- /dev/null ++++ b/akode/akode.pc.in +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=@prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: akode ++Description: aKode is a simple audio-decoding frame-work ++Version: 2.0.2 ++Libs: -L${libdir} -lakode ++Cflags: -I${includedir} +diff --git a/akode/configure.in.in b/akode/configure.in.in +index 80d0114..2b0ef60 100644 +--- a/akode/configure.in.in ++++ b/akode/configure.in.in +@@ -1,5 +1,6 @@ + dnl don't remove the below + dnl AC_OUTPUT(akode/akode-config) ++dnl AC_OUTPUT(akode/akode.pc) + + AC_CONFIG_HEADER(akode/lib/akode_export.h) + |