bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix icecast: rename private libvorbisidec conflicting with the main one (closes: #2862)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@10795 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2008-04-12 18:44:18 +00:00
parent b2acd6c3b1
commit 3febe89987
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/icecast/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006 OpenWrt.org # Copyright (C) 2006-2008 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -16,9 +16,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/icecast/ PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/icecast/
PKG_MD5SUM:=35256fbc4a93571662af2ed18fbbfcc5 PKG_MD5SUM:=35256fbc4a93571662af2ed18fbbfcc5
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
TREMOR_BUILD_DIR=$(PKG_BUILD_DIR)/libvorbisidec-1.2.0-dave TREMOR_BUILD_DIR=$(PKG_BUILD_DIR)/libvorbisidec-1.2.0-dave
@ -27,7 +24,7 @@ TREMOR_DIR=$(TREMOR_BUILD_DIR)/ipkg-install/usr
define Package/icecast define Package/icecast
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=+libcurl +libvorbisidec +libxml2 +libxslt DEPENDS:=+libcurl +libxml2 +libxslt
TITLE:=A streaming media server for Ogg/Vorbis and MP3 audio streams TITLE:=A streaming media server for Ogg/Vorbis and MP3 audio streams
URL:=http://www.icecast.org/ URL:=http://www.icecast.org/
SUBMENU:=multimedia SUBMENU:=multimedia

6
net/icecast/libvorbisidec.mk
View File

@ -8,15 +8,15 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libvorbisidec PKG_NAME:=icecast-libvorbisidec
PKG_VERSION:=1.2.0-dave PKG_VERSION:=1.2.0-dave
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=libvorbisidec-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://users.tpg.com.au/davico/openwrt/ PKG_SOURCE_URL:=http://users.tpg.com.au/davico/openwrt/
PKG_MD5SUM:=cb8e51aab92ef164f8e0e8853f7164fa PKG_MD5SUM:=cb8e51aab92ef164f8e0e8853f7164fa
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/libvorbisidec-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
PATCH_DIR=./patches-libvorbisidec PATCH_DIR=./patches-libvorbisidec