[vlc-commits] contrib: flac: simplify .pc patching

2015-10-21 Thread Rafaël Carré 
vlc/vlc-2.2 | branch: master | Rafaël Carré  | Tue Nov 25 
12:54:29 2014 +0100| [78c3a6967a2970bc50f53e045f6fc7c98c18f29e] | committer: 
Jean-Baptiste Kempf

contrib: flac: simplify .pc patching

dependency on ogg is already specified

(cherry picked from commit ea1c1c6198d1fbfa6d990ae6ac7653492fef41c6)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=78c3a6967a2970bc50f53e045f6fc7c98c18f29e
---

 contrib/src/flac/libFLAC-pc.patch |   10 --
 contrib/src/flac/rules.mak|2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/contrib/src/flac/libFLAC-pc.patch 
b/contrib/src/flac/libFLAC-pc.patch
deleted file mode 100644
index 8b5105a..000
--- a/contrib/src/flac/libFLAC-pc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 flac/src/libFLAC/flac.pc.in.orig   2013-05-05 14:05:30.059024229 +0200
-+++ flac/src/libFLAC/flac.pc.in2013-05-05 14:06:25.529822137 +0200
-@@ -7,6 +7,6 @@
- Description: Free Lossless Audio Codec Library
- Version: @VERSION@
- Requires.private: @OGG_PACKAGE@
--Libs: -L${libdir} -lFLAC
-+Libs: -L${libdir} -lFLAC -logg
- Libs.private: -lm
- Cflags: -I${includedir}
diff --git a/contrib/src/flac/rules.mak b/contrib/src/flac/rules.mak
index b27a5f5..53cf8e0 100644
--- a/contrib/src/flac/rules.mak
+++ b/contrib/src/flac/rules.mak
@@ -15,7 +15,6 @@ $(TARBALLS)/flac-$(FLAC_VERSION).tar.xz:
 
 flac: flac-$(FLAC_VERSION).tar.xz .sum-flac
$(UNPACK)
-   $(APPLY) $(SRC)/flac/libFLAC-pc.patch
 ifdef HAVE_DARWIN_OS
cd $(UNPACK_DIR) && sed -e 's,-dynamiclib,-dynamiclib -arch $(ARCH),' 
-i.orig configure
 endif
@@ -26,6 +25,7 @@ ifeq ($(ANDROID_ABI), x86)
cd $(UNPACK_DIR) && sed -i.orig -e s/"#  undef 
USE_OBSOLETE_SIGCONTEXT_FLAVOR"/"#define USE_OBSOLETE_SIGCONTEXT_FLAVOR"/g 
src/libFLAC/cpu.c
 endif
 endif
+   $(call pkg_static,"src/libFLAC/flac.pc.in")
$(UPDATE_AUTOCONFIG)
$(MOVE)
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: flac: simplify .pc patching

2014-11-25 Thread Rafaël Carré 
vlc | branch: master | Rafaël Carré  | Tue Nov 25 12:54:29 
2014 +0100| [ea1c1c6198d1fbfa6d990ae6ac7653492fef41c6] | committer: Rafaël Carré

contrib: flac: simplify .pc patching

dependency on ogg is already specified

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ea1c1c6198d1fbfa6d990ae6ac7653492fef41c6
---

 contrib/src/flac/libFLAC-pc.patch |   10 --
 contrib/src/flac/rules.mak|2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/contrib/src/flac/libFLAC-pc.patch 
b/contrib/src/flac/libFLAC-pc.patch
deleted file mode 100644
index 8b5105a..000
--- a/contrib/src/flac/libFLAC-pc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 flac/src/libFLAC/flac.pc.in.orig   2013-05-05 14:05:30.059024229 +0200
-+++ flac/src/libFLAC/flac.pc.in2013-05-05 14:06:25.529822137 +0200
-@@ -7,6 +7,6 @@
- Description: Free Lossless Audio Codec Library
- Version: @VERSION@
- Requires.private: @OGG_PACKAGE@
--Libs: -L${libdir} -lFLAC
-+Libs: -L${libdir} -lFLAC -logg
- Libs.private: -lm
- Cflags: -I${includedir}
diff --git a/contrib/src/flac/rules.mak b/contrib/src/flac/rules.mak
index bf72caf..aa4f884 100644
--- a/contrib/src/flac/rules.mak
+++ b/contrib/src/flac/rules.mak
@@ -15,7 +15,6 @@ $(TARBALLS)/flac-$(FLAC_VERSION).tar.xz:
 
 flac: flac-$(FLAC_VERSION).tar.xz .sum-flac
$(UNPACK)
-   $(APPLY) $(SRC)/flac/libFLAC-pc.patch
 ifdef HAVE_DARWIN_OS
cd $(UNPACK_DIR) && sed -e 's,-dynamiclib,-dynamiclib -arch $(ARCH),' 
-i.orig configure
 endif
@@ -26,6 +25,7 @@ ifeq ($(ANDROID_ABI), x86)
cd $(UNPACK_DIR) && sed -i.orig -e s/"#  undef 
USE_OBSOLETE_SIGCONTEXT_FLAVOR"/"#define USE_OBSOLETE_SIGCONTEXT_FLAVOR"/g 
src/libFLAC/cpu.c
 endif
 endif
+   $(call pkg_static,"src/libFLAC/flac.pc.in")
$(UPDATE_AUTOCONFIG)
$(MOVE)
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits