Added a few gstreamer plugins to the dependencies

The clementine package is now fully functional

Sound output works on both pulseaudio and OSS
The package builds fine on ARM (when lastfm is disabled) and x86 with gcc

Criticisms are welcome to hopefully make it good enough for pkgsrc

diff --git a/clementine/Makefile b/clementine/Makefile
index 16675d9600f77f856bbb299155d411c141f0c9aa..8ec6fd7f86c62d7f8998f1f4df19382d678f09a2 100644 (file)
--- a/clementine/Makefile
+++ b/clementine/Makefile
@@ -43,14 +43,17 @@ BUILD_DEPENDS+=     cmake-[0-9]*:../../devel/cmake \
 DEPENDS+=      qt4-tiff>=4.5.0:../../x11/qt4-tiff \
                qt4-sqlite3>=4.5.0:../../x11/qt4-sqlite3 \
                gst-plugins1-cdparanoia>=1.4.0:../../audio/gst-plugins1-cdparanoia \
+               gst-plugins1-oss>=1.4.0:../../audio/gst-plugins1-oss \
                gst-plugins1-faac>=1.4.0:../../audio/gst-plugins1-faac \
                gst-plugins1-faad>=1.4.0:../../audio/gst-plugins1-faad \
                gst-plugins1-flac>=1.4.0:../../audio/gst-plugins1-flac \
                gst-plugins1-gio>=1.4.0:../../sysutils/gst-plugins1-gio \
                gst-plugins1-lame>=1.4.0:../../audio/gst-plugins1-lame \
                gst-plugins1-mad>=1.4.0:../../audio/gst-plugins1-mad \
+               gst-plugins1-opus>=1.4.0:../../audio/gst-plugins1-opus \
                gst-plugins1-twolame>=1.4.0:../../audio/gst-plugins1-twolame \
-               gst-plugins1-vorbis>=1.4.0:../../audio/gst-plugins1-vorbis
+               gst-plugins1-vorbis>=1.4.0:../../audio/gst-plugins1-vorbis \
+               gst-plugins1-ogg>=1.4.0:../../multimedia/gst-plugins1-ogg
 
 
 .include "../../audio/chromaprint/buildlink3.mk"
@@ -70,8 +73,10 @@ DEPENDS+=    qt4-tiff>=4.5.0:../../x11/qt4-tiff \
 .include "../../math/fftw/buildlink3.mk"
 
 .include "../../multimedia/gstreamer1/buildlink3.mk"
+.include "../../multimedia/gst-plugins1-good/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-bad/buildlink3.mk"
+.include "../../multimedia/gst-plugins1-ugly/buildlink3.mk"
 
 .include "../../security/crypto++/buildlink3.mk" # Said to be optional on github but CMake requires it
 .include "../../security/qca2/buildlink3.mk"

diff --git a/clementine/TODO b/clementine/TODO
deleted file mode 100644 (file)
index c82f899..0000000
--- a/clementine/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-- Fix no sound output
-- Add more audio codecs to dependencies (for ogg, for example)

diff --git a/clementine/options.mk b/clementine/options.mk
index b3e31aba12bfc339db63e1d4d6eafe19fe586959..dffa121fe9a1b4426e5a3f1178b195bd2bd667eb 100644 (file)
--- a/clementine/options.mk
+++ b/clementine/options.mk
@@ -200,6 +200,7 @@ CMAKE_ARGS+=        -DENABLE_VK=OFF
 .if !empty(PKG_OPTIONS:Mpulseaudio)
 .      include "../../audio/pulseaudio/buildlink3.mk"
 CMAKE_ARGS+=   -DENABLE_LIBPULSE=ON
+DEPENDS+=      gst-plugins1-pulse>=1.4.0:../../audio/gst-plugins1-pulse
 .else
 CMAKE_ARGS+=   -DENABLE_LIBPULSE=OFF
 .endif

diff --git a/clementine/patch-options.description b/clementine/patch-options.description
deleted file mode 100644 (file)
index 3a2599d..0000000
--- a/clementine/patch-options.description
+++ /dev/null
@@ -1,98 +0,0 @@
---- ../../mk/defaults/options.description.orig 2017-01-05 21:25:14.704130195 +0000
-+++ ../../mk/defaults/options.description      2017-01-05 21:34:52.855017538 +0000
-@@ -11,6 +11,7 @@
- amanda-fqdn           Use FQDN's in Amanda.
- amanda-smb            Enable SMB backup support.
- amanda-ssh            Enable ssh as a transport.
-+amazon-cloud-drive    Enable support for Amazon Cloud Drive.
- amtterm-gamt          Build amtterm GUI version (gamt).
- amule-alc             Build aMule LinkCreator GUI version.
- amule-alcc            Build aMule LinkCreator for console.
-@@ -43,6 +44,7 @@
- aterm-kanji           Enable kanji support.
- aterm-xterm-scroll    Use xterm-scrollbar instead of a NeXT-like one.
- atheme-large-net      Enable support for large networks (i.e. > 2000 users).
-+audiocd                       Enable support for reading audio from CDs.
- audiofile             Enable audio conversion using libaudiofile.
- auth-db                       Use Berkley DB for the jabberd2 authorization database.
- auth-ldap             Use LDAP for jabberd2 authorization.
-@@ -61,6 +63,7 @@
- bittorrent            Enable bittorrent support.
- blender-exppython     Enable the Experimental Python support.
- boehm-gc              Use Boehm's garbage collector for memory allocation.
-+box                   Enable support for Box Drive.
- bozohttpd-do-htpasswd Enable .htpasswd file processing in bozohttpd.
- bugzilla-charts               Enable generation of charts.
- bugzilla-imagemagick  Compress .BMPs to save space.
-@@ -114,6 +117,7 @@
- debug                 Enable debugging facilities in the package.
- debug-info            Enable debug info in generated binaries (e.g. for crash analysis), but not full scale debugging.
- deliver-suid          Install deliver executable setuid root.
-+devicekit             Enable support for the DeviceKit backend.
- disable-compile-inits Disable compile time implicit initialization.
- djbdns-cachestats     Patch to add stats for cache hits/misses.
- djbdns-ignoreip2      Patch to treat certain responses as NXDOMAIN.
-@@ -134,6 +138,7 @@
- doxygen                       Include doxygen based document.
- drac                  Enable DRAC support.
- dri                   Enable Direct Rendering support.
-+dropbox                       Enable DropBox support.
- drupal-xmlservices    Enable XML-based services.
- dspam-preferences-extension   Enable preferences extension.
- dspam-verbose-debug   Enable verbose debugging support.
-@@ -236,6 +241,7 @@
- gif                   Enable GIF support.
- gimp                  Enable GIMP support.
- gimp1-helpbrowser     Link against gnome1 to get a help browser.
-+gio                   Enable support for Gnome Input/Output.
- git                   Enable Git support.
- git-gui                       Build the GUI in Tcl/Tk.
- glade                 Enable Glade support
-@@ -252,6 +258,7 @@
- gnuplot-pdf-doc               Install PDF document.
- gnutls                        Enable GNU TLS support.
- goffice                       Enable goffice support.
-+google-drive          Enable Google Drive support.
- gopher                        Enable support for the Gopher information system.
- gpgme                 Enable gpg support, by using the gpgme library.
- gqmpeg-japanese               Japanese ID3 tag support.
-@@ -406,6 +413,7 @@
- lang-zh                       Add Chinese language support.
- lang-zh-cn            Add Chinese Simplified language support.
- lang-zh-tw            Add Chinese Traditional language support.
-+lastfm                        Enable LastFM support.
- latex                 Depend on latex for build-time or run-time documentation.
- lcms                  Enable Light Color Management System support.
- ldap                  Enable LDAP support.
-@@ -484,6 +492,7 @@
- modperl1              Use modperl 1.x as the CGI manager (with Apache 1.x).
- modperl2              Use modperl 2.x as the CGI manager (with Apache 2.x).
- modplug                       Use for decoding mod-like music formats.
-+moodbar                       Enable Moodbar support.
- motif                 Enable motif support.
- motoya                        Add motoya fonts.
- mozilla                       Use mozilla as gecko rendering engine.
-@@ -662,6 +671,7 @@
- skey                  Enable S/Key support.
- skk                   Use SKK for Kana-to-Kanji conversion.
- skkdic-expr2          Enable fast skkdic-expr tool.
-+skydrive              Enable Microsoft SkyDrive support.
- slang                 Enable S-Lang support.
- slp                   Enable Service Location Protocol support.
- small-net             Tune for a smaller networks.
-@@ -786,6 +796,7 @@
- vice-hwscaling                Enable hardware-assisted screen scaling.
- vidix                 Enable VIDIX (Video Interface for *niX support).
- viewvc-php            Use php to colorize .php and .inc files.
-+visualisations                Enable Visualisations from ProjectM.
- vlc-skins             Enable skins support in VLC.
- vorbis                        Enable Ogg Vorbis support.
- w3m                   Use and enable support for the w3m browser.
-@@ -800,6 +811,7 @@
- websocket             Websocket protocol support (as specified in RFC6455)
- webvmail              Install CGI script for voicemail.
- wide-curses           Enable wide curses support.
-+wiimote                       Enable Wiimote support.
- winbind                       Enable name-service switch daemon support using Windows Servers.
- wiredtiger            Enable WiredTiger support.
- wmf                   Enable WMF support.