5 files changed, 114 insertions, 0 deletions
diff --git a/package/Config.in b/package/Config.in
index 56d68dd57..791b78420 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -149,6 +149,7 @@ source "package/gnutls/Config.in" ## libgnutls
 source "package/libgpg-error/Config.in"
 source "package/libid3tag/Config.in"
 source "package/jpeg/Config.in"  # libjpeg
+source "package/libogg/Config.in"
 source "package/libtool/Config.in"  # libltdl
 source "package/lzo/Config.in"  # liblzo
 source "package/matrixssl/Config.in"  # libmatrixssl
diff --git a/package/Makefile b/package/Makefile
index 2776dbc7d..12521252f 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -79,6 +79,7 @@ package-$(BR2_PACKAGE_LIBGPG_ERROR) += libgpg-error
 package-$(BR2_PACKAGE_LIBID3TAG) += libid3tag
 package-$(BR2_PACKAGE_LIBNET) += libnet
 package-$(BR2_PACKAGE_LIBNIDS) += libnids
+package-$(BR2_PACKAGE_LIBOGG) += libogg
 package-$(BR2_PACKAGE_LIBOSIP2) += libosip2
 package-$(BR2_PACKAGE_LIBPCAP) += libpcap
 package-$(BR2_PACKAGE_LIBPNG) += libpng
diff --git a/package/libogg/Config.in b/package/libogg/Config.in
new file mode 100644
index 000000000..38213a5cc
--- /dev/null
+++ b/package/libogg/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBOGG
+	tristate "libogg - The Ogg bitstream handling library"
+	default m if CONFIG_DEVEL
+	help
+	  The Ogg bitstream handling library.
+	  
+	  http://www.vorbis.com/
+	  
diff --git a/package/libogg/Makefile b/package/libogg/Makefile
new file mode 100644
index 000000000..48414238c
--- /dev/null
+++ b/package/libogg/Makefile
@@ -0,0 +1,96 @@
+# $Id$
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libogg
+PKG_VERSION:=1.1.2
+PKG_RELEASE:=1
+PKG_MD5SUM:=4d82996517bf33bb912c97e9d0b635c4
+
+PKG_SOURCE_URL:=http://downloads.xiph.org/releases/ogg/
+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,LIBOGG,libogg,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(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" \
+		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 \
+	);
+	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_LIBOGG):
+	install -m0755 -d $(IDIR_LIBOGG)/usr/lib
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libogg.so.* $(IDIR_LIBOGG)/usr/lib/
+	$(RSTRIP) $(IDIR_LIBOGG)
+	$(IPKG_BUILD) $(IDIR_LIBOGG) $(PACKAGE_DIR)
+
+$(STAGING_DIR)/usr/lib/libogg.so: $(PKG_BUILD_DIR)/.built
+	mkdir -p $(STAGING_DIR)/usr/include
+	cp -fpR $(PKG_INSTALL_DIR)/usr/include/ogg $(STAGING_DIR)/usr/include/
+	mkdir -p $(STAGING_DIR)/usr/lib
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libogg.a $(STAGING_DIR)/usr/lib/
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libogg.so* $(STAGING_DIR)/usr/lib/
+	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
+	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ogg.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+	$(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/ogg.pc
+	$(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/ogg.pc
+	touch $@
+
+install-dev: $(STAGING_DIR)/usr/lib/libogg.so
+
+uninstall-dev:
+	rm -rf \
+		$(STAGING_DIR)/usr/include/ogg \
+		$(STAGING_DIR)/usr/lib/libogg.a \
+		$(STAGING_DIR)/usr/lib/libogg.so* \
+		$(STAGING_DIR)/usr/lib/pkgconfig/ogg.pc \
+
+compile: install-dev
+clean: uninstall-dev
+
+mostlyclean:
+	-$(MAKE) -C $(PKG_BUILD_DIR) clean
+	rm -f $(PKG_BUILD_DIR)/.built
+
diff --git a/package/libogg/ipkg/libogg.control b/package/libogg/ipkg/libogg.control
new file mode 100644
index 000000000..ac2b1c90b
--- /dev/null
+++ b/package/libogg/ipkg/libogg.control
@@ -0,0 +1,8 @@
+Package: libogg
+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/libogg/
+Description: The Ogg bitstream handling library