pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
deadbeef: Update to 1.8.3. Still fails to run.
Module Name: pkgsrc-wip
Committed By: nia <nia%netbsd.org@localhost>
Pushed By: nee
Date: Sat May 16 13:15:53 2020 +0100
Changeset: e93712ce8fff37b146d7249ed2e8c982f36d82b7
Modified Files:
deadbeef/Makefile
deadbeef/PLIST
deadbeef/distinfo
deadbeef/options.mk
Log Message:
deadbeef: Update to 1.8.3. Still fails to run.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e93712ce8fff37b146d7249ed2e8c982f36d82b7
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
deadbeef/Makefile | 17 ++++++++++++++---
deadbeef/PLIST | 11 +++++++----
deadbeef/distinfo | 8 ++++----
deadbeef/options.mk | 36 +++++++++++++++++++++++++++++++++---
4 files changed, 58 insertions(+), 14 deletions(-)
diffs:
diff --git a/deadbeef/Makefile b/deadbeef/Makefile
index 80e20872e6..1d2d878288 100644
--- a/deadbeef/Makefile
+++ b/deadbeef/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.6 2015/07/13 10:30:47 roelants Exp $
-DISTNAME= deadbeef-1.8.2
+DISTNAME= deadbeef-1.8.3
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GITHUB:=DeaDBeeF-Player/}
@@ -18,10 +18,15 @@ USE_TOOLS+= msgfmt msgmerge xgettext
USE_TOOLS+= bison perl
TOOL_DEPENDS+= yasm-[0-9]*:../../devel/yasm
+TOOL_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
+
+LIBS+= ${BUILDLINK_LDADD.gettext}
.include "../../mk/oss.buildlink3.mk"
+PLIST_VARS+= oss
.if ${OSS_TYPE} != "none"
+PLIST.oss= yes
CONFIGURE_ARGS+= --enable-oss
MAKE_ENV+= OSS_LIBS=${LIBOSSAUDIO}
.else
@@ -30,24 +35,30 @@ CONFIGURE_ARGS+= --disable-oss
# using mpg123 instead
CONFIGURE_ARGS+= --disable-libmad
+CONFIGURE_ARGS+= --disable-nullout
+CONFIGURE_ARGS+= --disable-static
+
+BUILDLINK_TRANSFORM+= opt:-std=c99:-std=gnu99 # uses alloca
pre-configure:
cd ${WRKSRC} && ./autogen.sh
.include "options.mk"
.include "../../archivers/libzip/buildlink3.mk"
+.include "../../audio/faac/buildlink3.mk"
+.include "../../audio/faad2/buildlink3.mk"
.include "../../audio/flac/buildlink3.mk"
+.include "../../audio/libcddb/buildlink3.mk"
.include "../../audio/libsamplerate/buildlink3.mk"
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../audio/mpg123/buildlink3.mk"
-.include "../../audio/musepack/buildlink3.mk"
.include "../../audio/opusfile/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/imlib2/buildlink3.mk"
-.include "../../multimedia/ffmpeg4/buildlink3.mk"
+.include "../../misc/libcdio/buildlink3.mk"
.include "../../sysutils/dbus/buildlink3.mk"
.include "../../textproc/jansson/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
diff --git a/deadbeef/PLIST b/deadbeef/PLIST
index 44e87c36a9..b32f0d89ee 100644
--- a/deadbeef/PLIST
+++ b/deadbeef/PLIST
@@ -117,6 +117,8 @@ lib/deadbeef/data68/Replay/utopia.bin
lib/deadbeef/data68/Replay/vikingchild.bin
lib/deadbeef/data68/Replay/xbiossound.bin
lib/deadbeef/data68/Replay/zonewarrior.bin
+lib/deadbeef/aac.la
+lib/deadbeef/cdda.la
lib/deadbeef/dca.la
lib/deadbeef/ddb_dumb.la
lib/deadbeef/ddb_gui_GTK3.la
@@ -124,7 +126,7 @@ lib/deadbeef/ddb_mono2stereo.la
lib/deadbeef/ddb_shn.la
lib/deadbeef/dsp_libsrc.la
lib/deadbeef/ffap.la
-lib/deadbeef/ffmpeg.la
+${PLIST.ffmpeg}lib/deadbeef/ffmpeg.la
lib/deadbeef/flac.la
lib/deadbeef/gme.la
lib/deadbeef/hotkeys.la
@@ -133,11 +135,10 @@ lib/deadbeef/lastfm.la
lib/deadbeef/m3u.la
lib/deadbeef/mms.la
lib/deadbeef/mp3.la
-lib/deadbeef/musepack.la
+${PLIST.musepack}lib/deadbeef/musepack.la
lib/deadbeef/notify.la
-lib/deadbeef/nullout.la
lib/deadbeef/opus.la
-lib/deadbeef/oss.la
+${PLIST.oss}lib/deadbeef/oss.la
lib/deadbeef/pltbrowser_gtk3.la
lib/deadbeef/psf.la
lib/deadbeef/rg_scanner.la
@@ -152,6 +153,7 @@ lib/deadbeef/vfs_zip.la
lib/deadbeef/vorbis.la
lib/deadbeef/vtx.la
lib/deadbeef/wildmidi.la
+${PLIST.wavpack}lib/deadbeef/wavpack.la
lib/deadbeef/wma.la
share/applications/deadbeef.desktop
share/deadbeef/pixmaps/buffering_16.png
@@ -206,6 +208,7 @@ share/locale/km/LC_MESSAGES/deadbeef.mo
share/locale/lg/LC_MESSAGES/deadbeef.mo
share/locale/lt/LC_MESSAGES/deadbeef.mo
share/locale/lv/LC_MESSAGES/deadbeef.mo
+share/locale/nb/LC_MESSAGES/deadbeef.mo
share/locale/nl/LC_MESSAGES/deadbeef.mo
share/locale/pl/LC_MESSAGES/deadbeef.mo
share/locale/pt/LC_MESSAGES/deadbeef.mo
diff --git a/deadbeef/distinfo b/deadbeef/distinfo
index 5e3f171340..e941464489 100644
--- a/deadbeef/distinfo
+++ b/deadbeef/distinfo
@@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.2 2012/04/29 15:06:26 roelants Exp $
-SHA1 (deadbeef-1.8.2.tar.gz) = 2f76a69a67d59c8eb486481d6420698d95acf59d
-RMD160 (deadbeef-1.8.2.tar.gz) = 7149d772b91848b65064a472142338354867181e
-SHA512 (deadbeef-1.8.2.tar.gz) = 5ff2d82fcaaf83c773d464c4217201414b657a69b07d1032a40cb4f3bee638d9fecd71c006439e65f6a2da263460cadd685323d3884223ae1bfd560af205c589
-Size (deadbeef-1.8.2.tar.gz) = 12859310 bytes
+SHA1 (deadbeef-1.8.3.tar.gz) = 353830cacf94f49d5812d3f20b097a95a7f2980b
+RMD160 (deadbeef-1.8.3.tar.gz) = 35ce1636fb3614a9a17099caaefb6607dcc11db9
+SHA512 (deadbeef-1.8.3.tar.gz) = d0101b730fc8504b990929fa255d88010c544c1d2090ec12c79106a2b1dbb9613d03f06f8a872ec7c2d61faab4c23993b7a7fcb4b3b8dbc91dc4a065a1c459a3
+Size (deadbeef-1.8.3.tar.gz) = 12963204 bytes
SHA1 (patch-intl_Makefile.in) = ae9496182c112bd14377adca7bfa191b37cabd2e
diff --git a/deadbeef/options.mk b/deadbeef/options.mk
index 9e20bad2eb..0adb242332 100644
--- a/deadbeef/options.mk
+++ b/deadbeef/options.mk
@@ -1,13 +1,18 @@
# $NetBSD: options.mk,v 1.2 2019/06/17 08:08:31 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.deadbeef
-PKG_SUPPORTED_OPTIONS= alsa pulseaudio
-PKG_SUGGESTED_OPTIONS.Linux= alsa
-PLIST_VARS+= alsa pulse
+# Audio outputs
+PKG_SUPPORTED_OPTIONS+= alsa pulseaudio
+# Additional codecs
+PKG_SUPPORTED_OPTIONS+= ffmpeg musepack wavpack
+
+PKG_SUGGESTED_OPTIONS+= ffmpeg musepack wavpack
+PKG_SUGGESTED_OPTIONS.Linux+= alsa
.include "../../mk/bsd.options.mk"
+PLIST_VARS+= alsa
.if !empty(PKG_OPTIONS:Malsa)
PLIST.alsa= yes
.include "../../audio/alsa-lib/buildlink3.mk"
@@ -15,9 +20,34 @@ PLIST.alsa= yes
CONFIGURE_ARGS+= --disable-alsa
.endif
+PLIST_VARS+= pulse
.if !empty(PKG_OPTIONS:Mpulseaudio)
PLIST.pulse= yes
.include "../../audio/pulseaudio/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-pulse
.endif
+
+PLIST_VARS+= ffmpeg
+.if !empty(PKG_OPTIONS:Mffmpeg)
+PLIST.ffmpeg= yes
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-ffmpeg
+.endif
+
+PLIST_VARS+= musepack
+.if !empty(PKG_OPTIONS:Mmusepack)
+PLIST.musepack= yes
+.include "../../audio/musepack/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-musepack
+.endif
+
+PLIST_VARS+= wavpack
+.if !empty(PKG_OPTIONS:Mwavpack)
+PLIST.wavpack= yes
+.include "../../audio/wavpack/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-wavpack
+.endif
Home |
Main Index |
Thread Index |
Old Index