From b27e018ff577abbee3b946b5feac5de5b8011a79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20K=C3=BChling?= Date: Tue, 3 May 2011 10:41:51 +0200 Subject: [PATCH] libtheora: add our own version of libtheora, better tuned for NanoNote this is a copy of libtheora from openwrt, updated to 1.2.0alpha1 and compiled with -O2 instead of -Os to not cripple various DSP code# --- libtheora/Makefile | 77 +++++++++++++++++++++++ libtheora/patches/001-no_docs_tests.patch | 35 +++++++++++ 2 files changed, 112 insertions(+) create mode 100644 libtheora/Makefile create mode 100644 libtheora/patches/001-no_docs_tests.patch diff --git a/libtheora/Makefile b/libtheora/Makefile new file mode 100644 index 0000000..fca2b26 --- /dev/null +++ b/libtheora/Makefile @@ -0,0 +1,77 @@ +# +# Copyright (C) 2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libtheora +PKG_VERSION:=1.2.0alpha1 +PKG_RELEASE:=1 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://downloads.xiph.org/releases/theora/ +PKG_MD5SUM:=a2b9b631aede517cf22dcd3f4abf8dd6 +PKG_FIXUP:=libtool + +PKG_BUILD_DEPENDS:=libvorbis + +include $(INCLUDE_DIR)/package.mk + +PKG_INSTALL=1 + +define Package/libtheora + MAINTAINER:="David Kuehling" + SECTION:=libs + CATEGORY:=Libraries + TITLE:=libtheora + URL:=http://xiph.org/theora/ + DEPENDS:=+libogg +endef + +define Package/libtheora/description +Theora is Xiph.Org\'s first publicly released video codec, intended +for use within the Foundation\'s Ogg multimedia streaming system. +Theora is derived directly from On2\'s VP3 codec. Theora adds more +degrees of freedom to the compression parameters and recent encoders +contain optimizations that make it much better than VP3\'s original code. +endef + +CONFIGURE_ARGS += --disable-float \ + --disable-examples \ + --disable-oggtest \ + --disable-vorbistest \ + --disable-sdltest \ + +# override -Os, to not cripple theora's performance +TARGET_CFLAGS += -O2 + +# remove, once we're done with tuning +MAKE_FLAGS += -j4 + +define Build/Configure + $(call Build/Configure/Default) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include/theora/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/theora/* $(1)/usr/include/theora/ + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ +endef + +define Package/libtheora/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libtheora)) + + +# The following comments configure the Emacs editor. Just ignore them. +# Local Variables: +# compile-command: "make -C ~/h/src/qi/openwrt-xburst package/libtheora/compile -j2 V=99" +# End: diff --git a/libtheora/patches/001-no_docs_tests.patch b/libtheora/patches/001-no_docs_tests.patch new file mode 100644 index 0000000..64d86a4 --- /dev/null +++ b/libtheora/patches/001-no_docs_tests.patch @@ -0,0 +1,35 @@ +Index: libtheora-1.2.0alpha1/Makefile.am +=================================================================== +--- libtheora-1.2.0alpha1.orig/Makefile.am 2010-09-23 22:26:52.000000000 +0200 ++++ libtheora-1.2.0alpha1/Makefile.am 2011-05-03 09:52:11.000000000 +0200 +@@ -8,7 +8,7 @@ + EXAMPLES_DIR = + endif + +-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 +Index: libtheora-1.2.0alpha1/Makefile.in +=================================================================== +--- libtheora-1.2.0alpha1.orig/Makefile.in 2010-09-23 23:59:14.000000000 +0200 ++++ libtheora-1.2.0alpha1/Makefile.in 2011-05-03 09:52:11.000000000 +0200 +@@ -106,7 +106,7 @@ + distdir dist dist-all distcheck + 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) +@@ -312,7 +312,7 @@ + AUTOMAKE_OPTIONS = foreign 1.11 dist-zip dist-xz + @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