From 0b73c4ff820bf846af18990aebf0e78fffdb8149 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Wed, 5 Dec 2012 17:31:10 +0000 Subject: [PATCH] libtheora: update to 1.1.1 Remove the patch against Makefile.in since the build is set up to do autoreconf anyways. [florian: make it apply cleanly, split patches so we know what they do] Signed-off-by: Andy Leiserson Signed-off-by: Florian Fainelli SVN-Revision: 34512 --- libs/libtheora/Makefile | 8 ++-- .../libtheora/patches/001-no_docs_tests.patch | 48 +++++++------------ libs/libtheora/patches/002-no_sdl_check.patch | 14 ++++++ 3 files changed, 36 insertions(+), 34 deletions(-) create mode 100644 libs/libtheora/patches/002-no_sdl_check.patch diff --git a/libs/libtheora/Makefile b/libs/libtheora/Makefile index 3fefbcb6f0..c159caa5fb 100644 --- a/libs/libtheora/Makefile +++ b/libs/libtheora/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008 OpenWrt.org +# Copyright (C) 2008-2012 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtheora -PKG_VERSION:=1.0 -PKG_RELEASE:=3 +PKG_VERSION:=1.1.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://downloads.xiph.org/releases/theora/ -PKG_MD5SUM:=c963937053f45a7878954bed37ceb182 +PKG_MD5SUM:=292ab65cedd5021d6b7ddd117e07cd8e PKG_FIXUP:=autoreconf PKG_BUILD_DEPENDS:=libvorbis diff --git a/libs/libtheora/patches/001-no_docs_tests.patch b/libs/libtheora/patches/001-no_docs_tests.patch index 0de12cf636..4a45b8b5bb 100644 --- a/libs/libtheora/patches/001-no_docs_tests.patch +++ b/libs/libtheora/patches/001-no_docs_tests.patch @@ -1,6 +1,7 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -8,7 +8,7 @@ else +diff -urN libtheora-1.1.1/Makefile.am libtheora-1.1.1.new/Makefile.am +--- libtheora-1.1.1/Makefile.am 2009-07-14 01:55:02.000000000 +0200 ++++ libtheora-1.1.1.new/Makefile.am 2012-12-05 14:21:06.103521554 +0100 +@@ -8,7 +8,7 @@ EXAMPLES_DIR = endif @@ -9,37 +10,24 @@ # we include the whole debian/ dir in EXTRA_DIST because there's a problem ---- a/Makefile.in -+++ b/Makefile.in -@@ -80,7 +80,7 @@ pkgconfigDATA_INSTALL = $(INSTALL_DATA) - DATA = $(pkgconfig_DATA) - ETAGS = etags - CTAGS = ctags --DIST_SUBDIRS = lib include doc tests m4 examples -+DIST_SUBDIRS = lib include m4 - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) -@@ -262,7 +262,7 @@ target_vendor = @target_vendor@ - AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2 - @THEORA_ENABLE_EXAMPLES_FALSE@EXAMPLES_DIR = +diff -urN libtheora-1.1.1/Makefile.in libtheora-1.1.1.new/Makefile.in +--- libtheora-1.1.1/Makefile.in 2009-10-01 20:04:07.000000000 +0200 ++++ libtheora-1.1.1.new/Makefile.in 2012-12-05 14:21:18.239521864 +0100 +@@ -164,7 +164,7 @@ @THEORA_ENABLE_EXAMPLES_TRUE@EXAMPLES_DIR = examples + @THEORA_ENABLE_EXAMPLES_FALSE@EXAMPLES_DIR = + -SUBDIRS = lib include doc tests m4 $(EXAMPLES_DIR) +SUBDIRS = lib include m4 $(EXAMPLES_DIR) # we include the whole debian/ dir in EXTRA_DIST because there's a problem # with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am ---- a/configure.ac -+++ b/configure.ac -@@ -310,11 +310,6 @@ fi - dnl check for SDL - HAVE_SDL=no - --AM_PATH_SDL(,[ -- HAVE_SDL=yes -- SDL_LIBS=`$SDL_CONFIG --libs` --],AC_MSG_WARN([*** Unable to find SDL -- Not compiling example players ***])) -- - dnl check for OSS - HAVE_OSS=no +@@ -200,7 +200,7 @@ + missing mkinstalldirs theora-uninstalled.pc.in theora.pc.in \ + theoradec-uninstalled.pc.in theoradec.pc.in \ + theoraenc-uninstalled.pc.in theoraenc.pc.in +-DIST_SUBDIRS = lib include doc tests m4 examples ++DIST_SUBDIRS = lib include m4 examples + all: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/libs/libtheora/patches/002-no_sdl_check.patch b/libs/libtheora/patches/002-no_sdl_check.patch new file mode 100644 index 0000000000..a1e7256b4b --- /dev/null +++ b/libs/libtheora/patches/002-no_sdl_check.patch @@ -0,0 +1,14 @@ +--- libtheora-1.1.1/configure.ac 2009-10-01 20:00:33.000000000 +0200 ++++ libtheora-1.1.1.new/configure.ac 2012-12-05 14:22:26.319523608 +0100 +@@ -313,11 +313,6 @@ + dnl check for SDL + HAVE_SDL=no + +-AM_PATH_SDL(,[ +- HAVE_SDL=yes +- SDL_LIBS=`$SDL_CONFIG --libs` +-],AC_MSG_WARN([*** Unable to find SDL -- Not compiling example players ***])) +- + dnl check for OSS + HAVE_OSS=no + AC_CHECK_HEADERS([sys/soundcard.h soundcard.h machine/soundcard.h],[ -- 2.30.2