1

[alpine-aports] [PATCH] main/opusfile: fix include of opus headers

Sören Tempel
Details
Message ID
<1444573078-13010-1-git-send-email-soeren+git@soeren-tempel.net>
Sender timestamp
1444573078
DKIM signature
missing
Download raw message
Patch: +22 -5
opus headers are installed to /usr/include/opus.
---
 main/opusfile/APKBUILD               | 15 ++++++++++-----
 main/opusfile/fix-opus-include.patch | 12 ++++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 main/opusfile/fix-opus-include.patch

diff --git a/main/opusfile/APKBUILD b/main/opusfile/APKBUILD
index 7408c97..6d55e9f 100644
--- a/main/opusfile/APKBUILD
+++ b/main/opusfile/APKBUILD
@@ -1,7 +1,8 @@
+# Contributor: Sören Tempel <soeren+alpinelinux@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=opusfile
 pkgver=0.6
-pkgrel=0
+pkgrel=1
 pkgdesc="A high-level API for decoding and seeking within .opus files"
 url="http://www.opus-codec.org/"
 arch="all"
@@ -11,7 +12,8 @@ depends_dev="libogg-dev openssl-dev opus-dev"
 makedepends="$depends_dev"
 install=""
 subpackages="$pkgname-dev $pkgname-doc"
-source="http://downloads.xiph.org/releases/opus/opusfile-$pkgver.tar.gz"
+source="http://downloads.xiph.org/releases/opus/opusfile-$pkgver.tar.gz
+	fix-opus-include.patch"
 
 _builddir="$srcdir"/opusfile-$pkgver
 prepare() {
@@ -44,6 +46,9 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="3d6705e66375f6205dffdd63b2ad3538  opusfile-0.6.tar.gz"
-sha256sums="2428717b356e139f18ed2fdb5ad990b5654a238907a0058200b39c46a7d03ea6  opusfile-0.6.tar.gz"
-sha512sums="6fee48f3da21eeffed1ee5a3852234032aa559335225b07383c1104f5efba2f88aebe41c453ab2de472a69766e0fa9b48bec2f97d2a096b27afa96901802ba02  opusfile-0.6.tar.gz"
+md5sums="3d6705e66375f6205dffdd63b2ad3538  opusfile-0.6.tar.gz
+6f657ede223112e9391ce23ebfc34818  fix-opus-include.patch"
+sha256sums="2428717b356e139f18ed2fdb5ad990b5654a238907a0058200b39c46a7d03ea6  opusfile-0.6.tar.gz
+b28204f1eb2271a411b6c7fbe38f87950a4b176885f261abad55de763098bd85  fix-opus-include.patch"
+sha512sums="6fee48f3da21eeffed1ee5a3852234032aa559335225b07383c1104f5efba2f88aebe41c453ab2de472a69766e0fa9b48bec2f97d2a096b27afa96901802ba02  opusfile-0.6.tar.gz
+0bb3b7cf4e3b4e5553a35f76d1eb4834ba1060f1318c1a813269e4f8b6b00d7c01025caaf6dd016a26e85b43abf22a0f5c52aa81fa39537a23e21bf6bc59fe4c  fix-opus-include.patch"
diff --git a/main/opusfile/fix-opus-include.patch b/main/opusfile/fix-opus-include.patch
new file mode 100644
index 0000000..12088b5
--- /dev/null
+++ b/main/opusfile/fix-opus-include.patch
@@ -0,0 +1,12 @@
+diff -upr opusfile-0.6.orig/include/opusfile.h opusfile-0.6/include/opusfile.h
+--- opusfile-0.6.orig/include/opusfile.h	2014-04-29 19:07:09.000000000 +0200
+@@ -107,7 +107,7 @@ extern "C" {
+ # include <stdarg.h>
+ # include <stdio.h>
+ # include <ogg/ogg.h>
+-# include <opus_multistream.h>
++# include <opus/opus_multistream.h>
+ 
+ /**@cond PRIVATE*/
+ 
-- 
2.6.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Natanael Copa
Details
Message ID
<20151012134720.0d35d76c@ncopa-desktop.alpinelinux.org>
In-Reply-To
<1444573078-13010-1-git-send-email-soeren+git@soeren-tempel.net> (view parent)
Sender timestamp
1444650440
DKIM signature
missing
Download raw message
On Sun, 11 Oct 2015 16:17:58 +0200
Sören Tempel <soeren+git@soeren-tempel.net> wrote:

> opus headers are installed to /usr/include/opus.

I think this patch is wrong. opusfile should use pkg-config to set the
cflag -I correctly. eg pkg-config --cflags opus

It also looks like it does that. If you build with 'make V=1' you'll
see that there are a -I/usr/include/opus which should make it find the
headers.



> ---
>  main/opusfile/APKBUILD               | 15 ++++++++++-----
>  main/opusfile/fix-opus-include.patch | 12 ++++++++++++
>  2 files changed, 22 insertions(+), 5 deletions(-)
>  create mode 100644 main/opusfile/fix-opus-include.patch
> 
> diff --git a/main/opusfile/APKBUILD b/main/opusfile/APKBUILD
> index 7408c97..6d55e9f 100644
> --- a/main/opusfile/APKBUILD
> +++ b/main/opusfile/APKBUILD
> @@ -1,7 +1,8 @@
> +# Contributor: Sören Tempel <soeren+alpinelinux@soeren-tempel.net>
>  # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
>  pkgname=opusfile
>  pkgver=0.6
> -pkgrel=0
> +pkgrel=1
>  pkgdesc="A high-level API for decoding and seeking within .opus files"
>  url="http://www.opus-codec.org/"
>  arch="all"
> @@ -11,7 +12,8 @@ depends_dev="libogg-dev openssl-dev opus-dev"
>  makedepends="$depends_dev"
>  install=""
>  subpackages="$pkgname-dev $pkgname-doc"
> -source="http://downloads.xiph.org/releases/opus/opusfile-$pkgver.tar.gz"
> +source="http://downloads.xiph.org/releases/opus/opusfile-$pkgver.tar.gz
> +	fix-opus-include.patch"
>  
>  _builddir="$srcdir"/opusfile-$pkgver
>  prepare() {
> @@ -44,6 +46,9 @@ package() {
>  	make DESTDIR="$pkgdir" install || return 1
>  }
>  
> -md5sums="3d6705e66375f6205dffdd63b2ad3538  opusfile-0.6.tar.gz"
> -sha256sums="2428717b356e139f18ed2fdb5ad990b5654a238907a0058200b39c46a7d03ea6  opusfile-0.6.tar.gz"
> -sha512sums="6fee48f3da21eeffed1ee5a3852234032aa559335225b07383c1104f5efba2f88aebe41c453ab2de472a69766e0fa9b48bec2f97d2a096b27afa96901802ba02  opusfile-0.6.tar.gz"
> +md5sums="3d6705e66375f6205dffdd63b2ad3538  opusfile-0.6.tar.gz
> +6f657ede223112e9391ce23ebfc34818  fix-opus-include.patch"
> +sha256sums="2428717b356e139f18ed2fdb5ad990b5654a238907a0058200b39c46a7d03ea6  opusfile-0.6.tar.gz
> +b28204f1eb2271a411b6c7fbe38f87950a4b176885f261abad55de763098bd85  fix-opus-include.patch"
> +sha512sums="6fee48f3da21eeffed1ee5a3852234032aa559335225b07383c1104f5efba2f88aebe41c453ab2de472a69766e0fa9b48bec2f97d2a096b27afa96901802ba02  opusfile-0.6.tar.gz
> +0bb3b7cf4e3b4e5553a35f76d1eb4834ba1060f1318c1a813269e4f8b6b00d7c01025caaf6dd016a26e85b43abf22a0f5c52aa81fa39537a23e21bf6bc59fe4c  fix-opus-include.patch"
> diff --git a/main/opusfile/fix-opus-include.patch b/main/opusfile/fix-opus-include.patch
> new file mode 100644
> index 0000000..12088b5
> --- /dev/null
> +++ b/main/opusfile/fix-opus-include.patch
> @@ -0,0 +1,12 @@
> +diff -upr opusfile-0.6.orig/include/opusfile.h opusfile-0.6/include/opusfile.h
> +--- opusfile-0.6.orig/include/opusfile.h	2014-04-29 19:07:09.000000000 +0200
> ++++ opusfile-0.6/include/opusfile.h	2015-10-11 16:14:49.617623661 +0200
> +@@ -107,7 +107,7 @@ extern "C" {
> + # include <stdarg.h>
> + # include <stdio.h>
> + # include <ogg/ogg.h>
> +-# include <opus_multistream.h>
> ++# include <opus/opus_multistream.h>
> + 
> + /**@cond PRIVATE*/
> + 



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---