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/libshout | |
| 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/libshout')
| -rw-r--r-- | package/libshout/Makefile | 8 | ||||
| -rw-r--r-- | package/libshout/ipkg/libshout.control | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/package/libshout/Makefile b/package/libshout/Makefile index b0c9e75e5..b5f9c3a09 100644 --- a/package/libshout/Makefile +++ b/package/libshout/Makefile @@ -9,11 +9,15 @@ PKG_NAME:= libshout PKG_VERSION:= 2.2.2 PKG_RELEASE:= 1 PKG_MD5SUM:= 4f75fc9901c724b712c371c9a1e782d3 -MASTER_SITES:= http://downloads.us.xiph.org/releases/libshout/ +PKG_DESCR:= Library which can be used to write a source client for streaming +PKG_SECTION:= libs +PKG_DEPENDS:= libvorbis libogg +PKG_URL:= http://directory.fsf.org/project/libshout +PKG_SITES:= http://downloads.us.xiph.org/releases/libshout/ include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBSHOUT,libshout,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBSHOUT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --with-speex=no \ diff --git a/package/libshout/ipkg/libshout.control b/package/libshout/ipkg/libshout.control deleted file mode 100644 index d1d9ce692..000000000 --- a/package/libshout/ipkg/libshout.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: libshout -Priority: optional -Section: libs -Depends: libvorbis, libogg -Description: Library which can be used to write a source client for streaming |