Remove the patch against Makefile.in since the build is set up to do autoreconf anyways.
Signed-off-by: Andy Leiserson <[email protected]> --- libs/libtheora/Makefile | 8 ++++---- libs/libtheora/patches/001-no_docs_tests.patch | 24 ++---------------------- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/libs/libtheora/Makefile b/libs/libtheora/Makefile index 3fefbcb..656b772 100644 --- a/libs/libtheora/Makefile +++ b/libs/libtheora/Makefile @@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libtheora -PKG_VERSION:=1.0 -PKG_RELEASE:=3 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_VERSION:=1.1.1 +PKG_RELEASE:=1 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://downloads.xiph.org/releases/theora/ -PKG_MD5SUM:=c963937053f45a7878954bed37ceb182 +PKG_SHA256SUM:=f36da409947aa2b3dcc6af0a8c2e3144bc19db2ed547d64e9171c59c66561c61 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 0de12cf..f5c5654 100644 --- a/libs/libtheora/patches/001-no_docs_tests.patch +++ b/libs/libtheora/patches/001-no_docs_tests.patch @@ -9,29 +9,9 @@ # 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 = - @THEORA_ENABLE_EXAMPLES_TRUE@EXAMPLES_DIR = examples --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 +@@ -313,11 +313,6 @@ fi dnl check for SDL HAVE_SDL=no @@ -42,4 +22,4 @@ - dnl check for OSS HAVE_OSS=no - + AC_CHECK_HEADERS([sys/soundcard.h soundcard.h machine/soundcard.h],[ -- 1.7.10.4 _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
