diff --git a/srcpkgs/deadbeef-devel b/srcpkgs/deadbeef-devel deleted file mode 120000 index e8b5f8233c..0000000000 --- a/srcpkgs/deadbeef-devel +++ /dev/null @@ -1 +0,0 @@ -deadbeef \ No newline at end of file diff --git a/srcpkgs/deadbeef/deadbeef-devel.template b/srcpkgs/deadbeef/deadbeef-devel.template deleted file mode 100644 index 80b22f2c40..0000000000 --- a/srcpkgs/deadbeef/deadbeef-devel.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'deadbeef-devel'. -# -depends="deadbeef" -short_desc="${sourcepkg} development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -do_install() { - vmove usr/include usr - vmove "usr/lib/deadbeef/*.a" usr/lib/deadbeef -} diff --git a/srcpkgs/deadbeef/deadbeef.rshlibs b/srcpkgs/deadbeef/deadbeef.rshlibs index 350f6c9ebf..9266ec478d 100644 --- a/srcpkgs/deadbeef/deadbeef.rshlibs +++ b/srcpkgs/deadbeef/deadbeef.rshlibs @@ -11,17 +11,12 @@ libcddb.so.2 libgtk-x11-2.0.so.0 libgdk-x11-2.0.so.0 libatk-1.0.so.0 -libgio-2.0.so.0 -libpangoft2-1.0.so.0 libpangocairo-1.0.so.0 libgdk_pixbuf-2.0.so.0 libcairo.so.2 libpango-1.0.so.0 -libfreetype.so.6 -libfontconfig.so.1 libgobject-2.0.so.0 libgthread-2.0.so.0 -librt.so.1 libglib-2.0.so.0 libSM.so.6 libICE.so.6 diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template index ad51036fee..f3c1c72667 100644 --- a/srcpkgs/deadbeef/template +++ b/srcpkgs/deadbeef/template @@ -1,16 +1,15 @@ # Template file for 'deadbeef'. pkgname=deadbeef version=0.5.5 -revision=2 +revision=3 build_style=gnu-configure -fulldepends="desktop-file-utils hicolor-icon-theme" +configure_args="--disable-static" +depends="desktop-file-utils hicolor-icon-theme" makedepends="pkg-config intltool gtk+-devel libSM-devel libICE-devel -alsa-lib-devel ffmpeg-devel libvorbis-devel libcurl-devel imlib2-devel -jpeg-devel libpng-devel libmad-devel libflac-devel wavpack-devel -libsndfile-devel libcdio-devel libcddb-devel libX11-devel dbus-devel -pulseaudio-devel faad2-devel yasm" - -subpackages="${pkgname}-devel" + alsa-lib-devel ffmpeg-devel libvorbis-devel libcurl-devel imlib2-devel + jpeg-devel libpng-devel libmad-devel libflac-devel wavpack-devel + libsndfile-devel libcdio-devel libcddb-devel libX11-devel dbus-devel + pulseaudio-devel faad2-devel yasm" short_desc="Ultimate Music Player For GNU/Linux" maintainer="davehome " license="GPL-2,LGPL-2.1" @@ -45,4 +44,6 @@ long_desc=" post_install() { vinstall ${FILESDIR}/deadbeef-queue.desktop 644 usr/share/applications + # Remove devel stuff. + rm -rf ${DESTDIR}/usr/include }