Skip to content
Snippets Groups Projects
Commit 1c8d8a3f authored by Philippe Gorley's avatar Philippe Gorley Committed by Adrien Béraud
Browse files

contrib: remove deprecated dependencies 

The flac, ogg and vorbis contribs were used by sndfile. They are not
used by ffmpeg, making them superfluous.

Change-Id: I57b2078c617fa764e3bc6302816a61ec9caa20c3
parent 05d3813d
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 256 deletions
contrib/src/flac/SHA512SUMS deleted 100644 → 0
+ 0
− 1
View file @ 05d3813d
9f62a83c2041ec6f02c0df65b796a920a0cd6ba6c2c034bb69535bca5df57ed69f96fe4bb41c0d5ccc229241d90efd2c7ec3785662b5a582a8e20e2e991e6477 flac-1.3.0.tar.xz
contrib/src/flac/libFLAC-pc.patch deleted 100644 → 0
+ 0
− 10
View file @ 05d3813d
--- flac/src/libFLAC/flac.pc.in.orig 2013-05-05 14:05:30.059024229 +0200
+++ flac/src/libFLAC/flac.pc.in 2013-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}
contrib/src/flac/rules.mak deleted 100644 → 0
+ 0
− 56
View file @ 05d3813d
# FLAC
FLAC_VERSION := 1.3.0
FLAC_URL := https://downloads.xiph.org/releases/flac/flac-$(FLAC_VERSION).tar.xz
PKGS += flac
ifeq ($(call need_pkg,"flac"),)
PKGS_FOUND += flac
endif
$(TARBALLS)/flac-$(FLAC_VERSION).tar.xz:
$(call download,$(FLAC_URL))
.sum-flac: 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
ifdef HAVE_ANDROID
ifeq ($(ANDROID_ABI), x86)
# cpu.c:130:29: error: sys/ucontext.h: No such file or directory
# defining USE_OBSOLETE_SIGCONTEXT_FLAVOR allows us to bypass that
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
$(UPDATE_AUTOCONFIG)
$(MOVE)
FLACCONF := $(HOSTCONF) \
--disable-thorough-tests \
--disable-doxygen-docs \
--disable-xmms-plugin \
--disable-cpplibs \
--disable-oggtest
# TODO? --enable-sse
ifdef HAVE_DARWIN_OS
ifneq ($(findstring $(ARCH),i386 x86_64),)
FLACCONF += --disable-asm-optimizations
endif
endif
ifdef HAVE_ANDROID
ifeq ($(ANDROID_ABI), x86)
FLACCONF += --disable-asm-optimizations
endif
endif
DEPS_flac = ogg
.flac: flac
cd $< && $(HOSTVARS) ./configure $(FLACCONF)
cd $</include && $(MAKE) install
cd $</src && $(MAKE) -C share install && $(MAKE) -C libFLAC install
touch $@
contrib/src/ogg/SHA512SUMS deleted 100644 → 0
+ 0
− 1
View file @ 05d3813d
980d8916b5d6bf22376105869a9b9d5312cee81f0ff1f6aa9f34359e92a93b7b34555a4c4f124922d87ef7e48a4b9451e35d9b536929b9144fcc22bcf6debbf0 libogg-1.3.1.tar.xz
contrib/src/ogg/libogg-1.1.patch deleted 100644 → 0
+ 0
− 56
View file @ 05d3813d
--- libogg/configure.in 2010-11-01 21:13:42.000000000 +0100
+++ libogg.new/configure.in 2010-11-03 23:59:54.267733114 +0100
@@ -28,17 +28,17 @@
case $host in
*-*-irix*)
DEBUG="-g -signed"
- CFLAGS="-O2 -w -signed"
+ EXTRA_CFLAGS="-O2 -w -signed"
PROFILE="-p -g3 -O2 -signed"
;;
sparc-sun-solaris*)
DEBUG="-v -g"
- CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
+ EXTRA_CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc"
;;
*)
DEBUG="-g"
- CFLAGS="-O"
+ EXTRA_CFLAGS="-O"
PROFILE="-g -p"
;;
esac
@@ -46,27 +46,27 @@
case $host in
*-*-linux*)
DEBUG="-g -Wall -fsigned-char"
- CFLAGS="-O20 -Wall -ffast-math -fsigned-char"
+ EXTRA_CFLAGS="-O20 -Wall -ffast-math -fsigned-char"
PROFILE="-Wall -W -pg -g -O20 -ffast-math -fsigned-char"
;;
sparc-sun-*)
DEBUG="-g -Wall -fsigned-char"
- CFLAGS="-O20 -ffast-math -fsigned-char"
+ EXTRA_CFLAGS="-O20 -ffast-math -fsigned-char"
PROFILE="-pg -g -O20 -fsigned-char"
;;
*-*-darwin*)
DEBUG="-fno-common -g -Wall -fsigned-char"
- CFLAGS="-fno-common -O4 -Wall -fsigned-char -ffast-math"
+ EXTRA_CFLAGS="-fno-common -O3 -Wall -fsigned-char -ffast-math"
PROFILE="-fno-common -O4 -Wall -pg -g -fsigned-char -ffast-math"
;;
*)
DEBUG="-g -Wall -fsigned-char"
- CFLAGS="-O20 -fsigned-char"
+ EXTRA_CFLAGS="-O20 -fsigned-char"
PROFILE="-O20 -g -pg -fsigned-char"
;;
esac
fi
-CFLAGS="$CFLAGS $cflags_save"
+CFLAGS="$EXTRA_CFLAGS $cflags_save"
DEBUG="$DEBUG $cflags_save"
PROFILE="$PROFILE $cflags_save"
contrib/src/ogg/libogg-disable-check.patch deleted 100644 → 0
+ 0
− 12
View file @ 05d3813d
diff -ru libogg/src/Makefile.am libogg/src/Makefile.am
--- libogg/src/Makefile.am 2011-08-04 19:07:42.000000000 +0200
+++ libogg-f/src/Makefile.am 2012-03-21 13:05:23.000000000 +0100
@@ -9,7 +9,7 @@
# build and run the self tests on 'make check'
-noinst_PROGRAMS = test_bitwise test_framing
+noinst_PROGRAMS =
test_bitwise_SOURCES = bitwise.c
test_bitwise_CFLAGS = -D_V_SELFTEST
contrib/src/ogg/rules.mak deleted 100644 → 0
+ 0
− 29
View file @ 05d3813d
# libogg
OGG_VERSION := 1.3.1
OGG_URL := https://downloads.xiph.org/releases/ogg/libogg-$(OGG_VERSION).tar.xz
#OGG_URL := $(CONTRIB_VIDEOLAN)/libogg-$(OGG_VERSION).tar.xz
PKGS += ogg
ifeq ($(call need_pkg,"ogg >= 1.0"),)
PKGS_FOUND += ogg
endif
$(TARBALLS)/libogg-$(OGG_VERSION).tar.xz:
$(call download,$(OGG_URL))
.sum-ogg: libogg-$(OGG_VERSION).tar.xz
ogg: libogg-$(OGG_VERSION).tar.xz .sum-ogg
$(UNPACK)
$(APPLY) $(SRC)/ogg/libogg-1.1.patch
$(APPLY) $(SRC)/ogg/libogg-disable-check.patch
$(UPDATE_AUTOCONFIG)
$(MOVE)
.ogg: ogg
$(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $< && $(MAKE) install
touch $@
contrib/src/vorbis/SHA512SUMS deleted 100644 → 0
+ 0
− 1
View file @ 05d3813d
f705c7740bec2dc6584ab8f103491a9d462136e3fa76454bde47e2ba04466b896ef066f7f925ad0a44d4c659c962717bc9099b3cecc20f12270d0ad53369ad53 libvorbis-1.3.4.tar.xz
contrib/src/vorbis/android.patch deleted 100644 → 0
+ 0
− 11
View file @ 05d3813d
--- libvorbis/configure.ac.orig 2012-09-07 00:17:47.000000000 +0200
+++ libvorbis/configure.ac 2012-09-07 00:18:01.000000000 +0200
@@ -130,5 +130,5 @@
DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
- CFLAGS="-O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char"
+ CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char"
# PROFILE="-Wall -Wextra -pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -fno-inline -static"
- PROFILE="-Wall -Wextra -pg -g -O20 -ffast-math -mno-ieee-fp -D_REENTRANT -fsigned-char -fno-inline"
+ PROFILE="-Wall -Wextra -pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char -fno-inline"
contrib/src/vorbis/ios.patch deleted 100644 → 0
+ 0
− 13
View file @ 05d3813d
--- libvorbis/configure.ac.orig 2012-09-07 00:17:47.000000000 +0200
+++ libvorbis/configure.ac 2012-09-07 00:18:01.000000000 +0200
@@ -199,8 +199,8 @@
PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" ;;
*-*-darwin*)
DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
- CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
- PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
+ CFLAGS="-DDARWIN -fno-common -Wall -O3 -ffast-math -fsigned-char"
+ PROFILE="-DDARWIN -fno-common -Wall -pg -O3 -ffast-math -fsigned-char";;
*-*-os2*)
# Use -W instead of -Wextra because gcc on OS/2 is an old version.
DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
contrib/src/vorbis/osx.patch deleted 100644 → 0
+ 0
− 13
View file @ 05d3813d
--- libvorbis/configure.ac.orig 2012-09-07 00:17:47.000000000 +0200
+++ libvorbis/configure.ac 2012-09-07 00:18:01.000000000 +0200
@@ -199,8 +199,8 @@
PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" ;;
*-*-darwin*)
DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
- CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
- PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
+ CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O3 -ffast-math -fsigned-char"
+ PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O3 -ffast-math -fsigned-char";;
*-*-os2*)
# Use -W instead of -Wextra because gcc on OS/2 is an old version.
DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"
contrib/src/vorbis/rules.mak deleted 100644 → 0
+ 0
− 53
View file @ 05d3813d
# libvorbis
VORBIS_VERSION := 1.3.4
VORBIS_URL := https://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSION).tar.xz
#VORBIS_URL := $(CONTRIB_VIDEOLAN)/libvorbis-$(VORBIS_VERSION).tar.gz
ifdef HAVE_FPU
PKGS += vorbis
endif
ifeq ($(call need_pkg,"vorbis >= 1.1"),)
PKGS_FOUND += vorbis
endif
PKGS_ALL += vorbisenc
ifdef BUILD_ENCODERS
PKGS += vorbisenc
endif
ifeq ($(call need_pkg,"vorbisenc >= 1.1"),)
PKGS_FOUND += vorbisenc
endif
$(TARBALLS)/libvorbis-$(VORBIS_VERSION).tar.xz:
$(call download,$(VORBIS_URL))
.sum-vorbis: libvorbis-$(VORBIS_VERSION).tar.xz
vorbis: libvorbis-$(VORBIS_VERSION).tar.xz .sum-vorbis
$(UNPACK)
ifndef HAVE_IOS
$(APPLY) $(SRC)/vorbis/osx.patch
else
$(APPLY) $(SRC)/vorbis/ios.patch
endif
ifdef HAVE_ANDROID
$(APPLY) $(SRC)/vorbis/android.patch
endif
$(UPDATE_AUTOCONFIG)
$(MOVE)
DEPS_vorbis = ogg
.vorbis: vorbis
$(RECONF) -Im4
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-docs --disable-examples --disable-oggtest
cd $< && $(MAKE) install
touch $@
.sum-vorbisenc: .sum-vorbis
touch $@
DEPS_vorbisenc = vorbis
.vorbisenc:
touch $@
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment