5 files changed, 124 insertions, 0 deletions
diff --git a/openwrt/package/Config.in b/openwrt/package/Config.in
index 791b78420d..f196a23ce5 100644
--- a/openwrt/package/Config.in
+++ b/openwrt/package/Config.in
@@ -175,6 +175,7 @@ source "package/sqlite2/Config.in" # libsqlite2
 source "package/libtasn1/Config.in"
 source "package/libupnp/Config.in"
 source "package/libusb/Config.in"
+source "package/libvorbis/Config.in"
 source "package/libxml2/Config.in"
 source "package/libxslt/Config.in"
 source "package/uclibc++/Config.in"
diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index 12521252f6..4aa8ad7c0a 100644
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -88,6 +88,7 @@ package-$(BR2_PACKAGE_LIBTASN1) += libtasn1
 package-$(BR2_PACKAGE_LIBTOOL) += libtool
 package-$(BR2_PACKAGE_LIBUPNP) += libupnp
 package-$(BR2_PACKAGE_LIBUSB) += libusb
+package-$(BR2_PACKAGE_LIBVORBIS) += libvorbis
 package-$(BR2_PACKAGE_LIBXML2) += libxml2
 package-$(BR2_PACKAGE_LIBXSLT) += libxslt
 package-$(BR2_PACKAGE_LIGHTTPD) += lighttpd
@@ -231,6 +232,7 @@ libgcrypt-compile: libgpg-error-compile
 libgd-compile: libpng-compile
 libnet-compile: libpcap-compile
 libnids-compile: libnet-compile
+libvorbis-compile: libogg-compile
 libxml2-compile: zlib-compile
 libxslt-compile: libxml2-compile
 lighttpd-compile: openssl-compile pcre-compile
diff --git a/openwrt/package/libvorbis/Config.in b/openwrt/package/libvorbis/Config.in
new file mode 100644
index 0000000000..ab93bd3922
--- /dev/null
+++ b/openwrt/package/libvorbis/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBVORBIS
+	tristate "libvorbis - The Vorbis General Audio Compression Codec library"
+	default m if CONFIG_DEVEL
+	select BR2_PACKAGE_LIBOGG
+	help
+	  The Vorbis General Audio Compression Codec library.
+	  
+	  http://www.vorbis.com/
+	  
diff --git a/openwrt/package/libvorbis/Makefile b/openwrt/package/libvorbis/Makefile
new file mode 100644
index 0000000000..1777ed8a3f
--- /dev/null
+++ b/openwrt/package/libvorbis/Makefile
@@ -0,0 +1,104 @@
+# $Id$
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libvorbis
+PKG_VERSION:=1.1.1
+PKG_RELEASE:=1
+PKG_MD5SUM:=b77270c24840af4de54bea5ad1c0b252
+
+PKG_SOURCE_URL:=http://downloads.xiph.org/releases/vorbis/
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_CAT:=zcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(TOPDIR)/package/rules.mk
+
+$(eval $(call PKG_template,LIBVORBIS,libvorbis,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+# NOTE: check ./toolchain/libmissing
+# it implements those functions missing from the version of uClibc we're currently using
+# for libvorbis, they are cosf/sinf
+
+$(PKG_BUILD_DIR)/.configured:
+	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(strip $(TARGET_CFLAGS))" \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		LIBS="-lm -logg -lmissing" \
+		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
+		./configure \
+			--target=$(GNU_TARGET_NAME) \
+			--host=$(GNU_TARGET_NAME) \
+			--build=$(GNU_HOST_NAME) \
+			--program-prefix="" \
+			--program-suffix="" \
+			--prefix=/usr \
+			--exec-prefix=/usr \
+			--bindir=/usr/bin \
+			--datadir=/usr/share \
+			--includedir=/usr/include \
+			--infodir=/usr/share/info \
+			--libdir=/usr/lib \
+			--libexecdir=/usr/lib \
+			--localstatedir=/var \
+			--mandir=/usr/share/man \
+			--sbindir=/usr/sbin \
+			--sysconfdir=/etc \
+			$(DISABLE_LARGEFILE) \
+			$(DISABLE_NLS) \
+			--enable-shared \
+			--enable-static \
+			--disable-rpath \
+			--with-gnu-ld \
+			--with-ogg="$(STAGING_DIR)/usr" \
+			--with-ogg-includes="$(STAGING_DIR)/usr/include" \
+			--with-ogg-libraries="$(STAGING_DIR)/usr/lib" \
+	);
+	touch $@
+
+$(PKG_BUILD_DIR)/.built:
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
+	touch $@
+
+$(IPKG_LIBVORBIS):
+	install -m0755 -d $(IDIR_LIBVORBIS)/usr/lib
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libvorbis.so.* $(IDIR_LIBVORBIS)/usr/lib/
+	$(RSTRIP) $(IDIR_LIBVORBIS)
+	$(IPKG_BUILD) $(IDIR_LIBVORBIS) $(PACKAGE_DIR)
+
+$(STAGING_DIR)/usr/lib/libvorbis.so: $(PKG_BUILD_DIR)/.built
+	mkdir -p $(STAGING_DIR)/usr/include
+	cp -fpR $(PKG_INSTALL_DIR)/usr/include/vorbis $(STAGING_DIR)/usr/include/
+	mkdir -p $(STAGING_DIR)/usr/lib
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libvorbis.a $(STAGING_DIR)/usr/lib/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libvorbis{,enc,file}.so* $(STAGING_DIR)/usr/lib/
+	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/vorbis{,enc,file}.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+	$(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/vorbis{,enc,file}.pc
+	$(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/vorbis{,enc,file}.pc
+	touch $@
+
+install-dev: $(STAGING_DIR)/usr/lib/libvorbis.so
+
+uninstall-dev:
+	rm -rf \
+		$(STAGING_DIR)/usr/include/vorbis \
+		$(STAGING_DIR)/usr/lib/libvorbis{,enc,file}.a \
+		$(STAGING_DIR)/usr/lib/libvorbis{,enc,file}.so* \
+		$(STAGING_DIR)/usr/lib/pkgconfig/vorbis{,enc,file}.pc \
+
+compile: install-dev
+clean: uninstall-dev
+
+mostlyclean:
+	-$(MAKE) -C $(PKG_BUILD_DIR) clean
+	rm -f $(PKG_BUILD_DIR)/.built
+
diff --git a/openwrt/package/libvorbis/ipkg/libvorbis.control b/openwrt/package/libvorbis/ipkg/libvorbis.control
new file mode 100644
index 0000000000..5e4d8808d5
--- /dev/null
+++ b/openwrt/package/libvorbis/ipkg/libvorbis.control
@@ -0,0 +1,8 @@
+Package: libvorbis
+Priority: optional
+Section: libs
+Version: [TBDL]
+Architecture: [TBDL]
+Maintainer: OpenWrt Developers Team <bugs@openwrt.org>
+Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/libvorbis/
+Description: The Vorbis General Audio Compression Codec library