diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/lame | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/lame')
| -rw-r--r-- | package/lame/Makefile | 13 | ||||
| -rw-r--r-- | package/lame/ipkg/lame.control | 5 | ||||
| -rw-r--r-- | package/lame/ipkg/liblame.control | 4 |
3 files changed, 10 insertions, 12 deletions
diff --git a/package/lame/Makefile b/package/lame/Makefile index 1509f62d7..315f501d5 100644 --- a/package/lame/Makefile +++ b/package/lame/Makefile @@ -9,12 +9,19 @@ PKG_NAME:= lame PKG_VERSION:= 398-2 PKG_RELEASE:= 1 PKG_MD5SUM:= 719dae0ee675d0c16e0e89952930ed35 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=lame/} +PKG_DESCR:= LAME MP3 encoder +PKG_SECTION:= sound +PKG_DEPENDS:= libncurses +PKG_URL:= http://lame.sourceforge.net +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=lame/} + +PKG_DESCR_1:= LAME MP3 encoding library +PKG_SECTION_1:= libs include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,LAME,lame,$(PKG_VERSION)-$(PKG_RELEASE))) -$(eval $(call PKG_template,LIBLAME,liblame,$(PKG_VERSION)-$(PKG_RELEASE))) +$(eval $(call PKG_template,LAME,lame,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,LIBLAME,liblame,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_1},${PKG_SECTION_1})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/lame/ipkg/lame.control b/package/lame/ipkg/lame.control deleted file mode 100644 index 605416094..000000000 --- a/package/lame/ipkg/lame.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: lame -Priority: optional -Section: sound -Depends: ncurses -Description: LAME MP3 encoder diff --git a/package/lame/ipkg/liblame.control b/package/lame/ipkg/liblame.control deleted file mode 100644 index 1ce78f175..000000000 --- a/package/lame/ipkg/liblame.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: liblame -Priority: optional -Section: sound -Description: LAME MP3 encoding library |