[oe-commits] org.oe.dev speex: fix packaging *.h headers

[xjqian commit]

speex: fix packaging *.h headers
* remove hardcoded -I/usr/indlude is fine but remove all of the "includedir"
  strings in the Makefiles is an overreaction and causes problem during installation

Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: 68b7917c31d51d96042d046ffea5ff2b58d6fa31
ViewMTN: http://monotone.openembedded.org/revision/info/68b7917c31d51d96042d046ffea5ff2b58d6fa31
Files:
1
packages/speex/speex_1.1.12+1.2beta1.bb
packages/speex/speex_1.1.12.bb
packages/speex/speex_1.1.7.bb
Diffs:

#
# mt diff -rd6723956f98523259bb842a7d6192f518048f636 -r68b7917c31d51d96042d046ffea5ff2b58d6fa31
#
# 
# 
# patch "packages/speex/speex_1.1.12+1.2beta1.bb"
#  from [91f4e7440171313902585a24d4bf11d1388b5d75]
#    to [f4e404c373cafd1d01bf094caec29533e4be9d2c]
# 
# patch "packages/speex/speex_1.1.12.bb"
#  from [c759c1cb912c80c8ffc43359b398ca2bc2947234]
#    to [f522b4fa38bf020d83b6642856fd35a4a4402435]
# 
# patch "packages/speex/speex_1.1.7.bb"
#  from [f36ab67a057d9ca24be58dcd6db2f1c1a224ebab]
#    to [ef9967a5abd83601ccfb672b15a56b2e19d2f7b6]
# 
============================================================
--- packages/speex/speex_1.1.12+1.2beta1.bb	91f4e7440171313902585a24d4bf11d1388b5d75
+++ packages/speex/speex_1.1.12+1.2beta1.bb	f4e404c373cafd1d01bf094caec29533e4be9d2c
@@ -1,9 +1,9 @@ DEPENDS = "libogg"
 DESCRIPTION = "Speex is an Open Source/Free Software patent-free audio compression format designed for speech."
 SECTION = "libs"
 LICENSE = "BSD"
 HOMEPAGE = "http://www.speex.org"
 DEPENDS = "libogg"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-1.2beta1.tar.gz"
 S = "${WORKDIR}/${PN}-1.2beta1"
@@ -27,8 +27,6 @@ do_configure_append() {
 do_configure_append() {
 	sed -i s/"^OGG_CFLAGS.*$"/"OGG_CFLAGS = "/g Makefile */Makefile */*/Makefile
 	sed -i s/"^OGG_LIBS.*$"/"OGG_LIBS = -logg"/g Makefile */Makefile */*/Makefile
-	perl -pi -e 's:^includedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile
-	perl -pi -e 's:^oldincludedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile
 	perl -pi -e 's:\s*-I/usr/include$::g' Makefile */Makefile */*/Makefile
 }
 
============================================================
--- packages/speex/speex_1.1.12.bb	c759c1cb912c80c8ffc43359b398ca2bc2947234
+++ packages/speex/speex_1.1.12.bb	f522b4fa38bf020d83b6642856fd35a4a4402435
@@ -1,9 +1,9 @@ DEPENDS = "libogg"
 DESCRIPTION = "Speex is an Open Source/Free Software patent-free audio compression format designed for speech."
 SECTION = "libs"
 LICENSE = "BSD"
 HOMEPAGE = "http://www.speex.org"
 DEPENDS = "libogg"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-${PV}.tar.gz"
 
@@ -25,8 +25,6 @@ do_configure_append() {
 do_configure_append() {
 	sed -i s/"^OGG_CFLAGS.*$"/"OGG_CFLAGS = "/g Makefile */Makefile */*/Makefile
 	sed -i s/"^OGG_LIBS.*$"/"OGG_LIBS = -logg"/g Makefile */Makefile */*/Makefile
-	perl -pi -e 's:^includedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile
-	perl -pi -e 's:^oldincludedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile
 	perl -pi -e 's:\s*-I/usr/include$::g' Makefile */Makefile */*/Makefile
 }
 
============================================================
--- packages/speex/speex_1.1.7.bb	f36ab67a057d9ca24be58dcd6db2f1c1a224ebab
+++ packages/speex/speex_1.1.7.bb	ef9967a5abd83601ccfb672b15a56b2e19d2f7b6
@@ -1,9 +1,9 @@ DEPENDS = "libogg"
 DESCRIPTION = "Speex is an Open Source/Free Software patent-free audio compression format designed for speech."
 SECTION = "libs"
 LICENSE = "BSD"
 HOMEPAGE = "http://www.speex.org"
 DEPENDS = "libogg"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://www.speex.org/download/speex-${PV}.tar.gz"
 
@@ -21,8 +21,6 @@ do_configure_append() {
 do_configure_append() {
 	sed -i s/"^OGG_CFLAGS.*$"/"OGG_CFLAGS = "/g Makefile */Makefile */*/Makefile
 	sed -i s/"^OGG_LIBS.*$"/"OGG_LIBS = -logg"/g Makefile */Makefile */*/Makefile
-	perl -pi -e 's:^includedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile
-	perl -pi -e 's:^oldincludedir.*$:includedir = ${STAGING_INCDIR}:g' Makefile */Makefile */*/Makefile
 	perl -pi -e 's:\s*-I/usr/include$::g' Makefile */Makefile */*/Makefile
 }