Date: Thursday, June 21, 2018 @ 07:23:42 Author: alucryd Revision: 344247
upgpkg: pantheon-music 0.4.2.r434.1091a852-1 Modified: pantheon-music/trunk/PKGBUILD Deleted: pantheon-music/trunk/mesa-demos-conflict.patch pantheon-music/trunk/pantheon-music-install-dirs.patch -----------------------------------+ PKGBUILD | 49 +++++++++++------------------------- mesa-demos-conflict.patch | 36 -------------------------- pantheon-music-install-dirs.patch | 42 ------------------------------ 3 files changed, 15 insertions(+), 112 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-06-21 07:02:24 UTC (rev 344246) +++ PKGBUILD 2018-06-21 07:23:42 UTC (rev 344247) @@ -1,8 +1,8 @@ # $Id$ -# Maintainer: Maxime Gauduin <alucryd at gmail dot com> +# Maintainer: Maxime Gauduin <[email protected]> pkgname=pantheon-music -pkgver=0.4.2 +pkgver=0.4.2.r434.1091a852 pkgrel=1 pkgdesc='The Pantheon Music Player' arch=('x86_64') @@ -9,51 +9,32 @@ url='https://github.com/elementary/music' license=('GPL3') groups=('pantheon') -depends=('cairo' 'gdk-pixbuf2' 'glib2' 'glibc' 'gst-plugins-base-libs' - 'gstreamer' 'gtk3' 'json-glib' 'libaccounts-glib' 'libgda' 'libgee' - 'libgpod' 'libgsignon-glib' 'libpeas' 'libsoup' 'pango' 'taglib' - 'zeitgeist' +depends=('cairo' 'gdk-pixbuf2' 'glib2' 'gst-plugins-base-libs' 'gstreamer' + 'gtk3' 'json-glib' 'libaccounts-glib' 'libgda' 'libgee' 'libgpod' + 'libgsignon-glib' 'libpeas' 'libsoup' 'pango' 'taglib' 'zeitgeist' 'libgranite.so') -makedepends=('cmake' 'gobject-introspection' 'intltool' 'vala') +makedepends=('git' 'gobject-introspection' 'intltool' 'meson' 'vala') optdepends=('gst-plugins-base: "Base" plugin libraries' 'gst-plugins-good: "Good" plugin libraries' 'gst-plugins-bad: "Bad" plugin libraries' 'gst-plugins-ugly: "Ugly" plugin libraries') -replaces=('noise-player') -provides=('noise-player') -conflicts=('noise-player') -source=("pantheon-music-${pkgver}.tar.gz::https://github.com/elementary/music/archive/${pkgver}.tar.gz"; - 'mesa-demos-conflict.patch' - 'pantheon-music-install-dirs.patch') -sha256sums=('9e707e52da12eeb89b42630c697ac0adfefd20a0a12eac37ff3c65b106e0c9d3' - '205f26c7dd613036739517620da37fea0f2a9f9d74ea546d5bce2c0a859f2792' - 'd0ebc710a742d942e04a8df61d91dd75ae4b2aeafe7fece08f1fbc90c507f1df') +_commit='1091a85206ad6421add81c8cc6493fae310e6770' +source=("pantheon-music::git+https://github.com/elementary/music.git#commit=${_commit}";) +sha256sums=('SKIP') -prepare() { - if [[ -d build ]]; then - rm -rf build - fi - mkdir build +pkgver() { + cd pantheon-music - cd music-${pkgver} - - patch -Np1 -i ../mesa-demos-conflict.patch - patch -Np1 -i ../pantheon-music-install-dirs.patch + git describe --tags | sed 's/-/.r/; s/-g/./' } build() { - cd build - - cmake ../music-${pkgver} \ - -DCMAKE_BUILD_TYPE='Release' \ - -DCMAKE_INSTALL_PREFIX='/usr' \ - -DCMAKE_INSTALL_LIBDIR='/usr/lib' \ - -DGSETTINGS_COMPILE='OFF' - make -j1 + arch-meson pantheon-music build + ninja -C build } package() { - make DESTDIR="${pkgdir}" -C build install + DESTDIR="${pkgdir}" ninja -C build install } # vim: ts=2 sw=2 et: Deleted: mesa-demos-conflict.patch =================================================================== --- mesa-demos-conflict.patch 2018-06-21 07:02:24 UTC (rev 344246) +++ mesa-demos-conflict.patch 2018-06-21 07:23:42 UTC (rev 344247) @@ -1,36 +0,0 @@ -diff -rupN music-0.4.1.orig/data/org.pantheon.noise.appdata.xml.in music-0.4.1/data/org.pantheon.noise.appdata.xml.in ---- music-0.4.1.orig/data/org.pantheon.noise.appdata.xml.in 2017-08-08 23:41:12.570798209 +0200 -+++ music-0.4.1/data/org.pantheon.noise.appdata.xml.in 2017-08-08 23:42:54.621177616 +0200 -@@ -56,7 +56,7 @@ - </release> - </releases> - <provides> -- <binary>noise</binary> -+ <binary>pantheon-music</binary> - <library>libnoise-core.so.0</library> - </provides> - <developer_name>elementary LLC.</developer_name> -diff -rupN music-0.4.1.orig/data/org.pantheon.noise.desktop.in.in music-0.4.1/data/org.pantheon.noise.desktop.in.in ---- music-0.4.1.orig/data/org.pantheon.noise.desktop.in.in 2017-08-08 23:41:12.570798209 +0200 -+++ music-0.4.1/data/org.pantheon.noise.desktop.in.in 2017-08-08 23:43:25.620407132 +0200 -@@ -3,7 +3,7 @@ Type=Application - _Name=@APP_NAME@ - _GenericName=Music Player - _Comment=Listen to music --Exec=noise %U -+Exec=pantheon-music %U - Icon=multimedia-audio-player - Terminal=false - Categories=Audio;Music;Player;AudioVideo;GNOME;GTK; -diff -rupN music-0.4.1.orig/src/CMakeLists.txt music-0.4.1/src/CMakeLists.txt ---- music-0.4.1.orig/src/CMakeLists.txt 2017-08-08 23:41:12.580797885 +0200 -+++ music-0.4.1/src/CMakeLists.txt 2017-08-08 23:45:06.061592605 +0200 -@@ -88,7 +88,7 @@ vala_precompile (CLIENT_VALA_C ${SRC_TAR - ${CLIENT_VAPI} - ) - --set (EXEC_NAME ${SRC_TARGET}) -+set (EXEC_NAME pantheon-music) - - add_definitions (${DEPS_CFLAGS}) - link_directories (${DEPS_LIBRARY_DIRS}) Deleted: pantheon-music-install-dirs.patch =================================================================== --- pantheon-music-install-dirs.patch 2018-06-21 07:02:24 UTC (rev 344246) +++ pantheon-music-install-dirs.patch 2018-06-21 07:23:42 UTC (rev 344247) @@ -1,42 +0,0 @@ -diff -rupN noise-0.3.1.orig/CMakeLists.txt noise-0.3.1/CMakeLists.txt ---- noise-0.3.1.orig/CMakeLists.txt 2015-08-30 14:03:02.563699740 +0200 -+++ noise-0.3.1/CMakeLists.txt 2015-08-30 14:05:57.528197582 +0200 -@@ -13,11 +13,10 @@ set (VERSION "0.3.1") - set (VERSION_INFO "Stable Release") - - include (GNUInstallDirs) --set (DATADIR ${CMAKE_INSTALL_PREFIX}/share) -+set (DATADIR ${CMAKE_INSTALL_FULL_DATADIR}) - set (PKG_DATADIR ${DATADIR}/${CMAKE_PROJECT_NAME}) - set (ICON_DIR ${DATADIR}/${CMAKE_PROJECT_NAME}/icons) --set (PLUGIN_DIR_UNPREFIXED ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME}/plugins) --set (PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR_UNPREFIXED}) -+set (PLUGIN_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/${CMAKE_PROJECT_NAME}/plugins) - - add_definitions ("-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\"") - -diff -rupN noise-0.3.1.orig/core/noise-core.pc.cmake noise-0.3.1/core/noise-core.pc.cmake ---- noise-0.3.1.orig/core/noise-core.pc.cmake 2015-08-30 14:03:02.563699740 +0200 -+++ noise-0.3.1/core/noise-core.pc.cmake 2015-08-30 14:03:14.083336997 +0200 -@@ -1,12 +1,12 @@ - prefix=@PREFIX@ --exec_prefix=@DOLLAR@{prefix} --libdir=@DOLLAR@{prefix}/@CMAKE_INSTALL_LIBDIR@ --includedir=@DOLLAR@{prefix}/@CMAKE_INSTALL_INCLUDEDIR@/ --plugindir=@DOLLAR@{prefix}/@PLUGIN_DIR_UNPREFIXED@ -- -+exec_prefix=@PREFIX@ -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ -+plugindir=@PLUGIN_DIR@ -+ - Name: Noise --Description: Noise headers --Version: @VERSION@ -+Description: Noise headers -+Version: @VERSION@ - Libs: -lnoise-core - Cflags: -I@DOLLAR@{includedir}/noise-core --Requires: glib-2.0 gio-2.0 gee-0.8 libpeas-1.0 libpeas-gtk-1.0 gtk+-3.0 granite gstreamer-1.0 gstreamer-pbutils-1.0 gstreamer-tag-1.0 -\ No newline at end of file -+Requires: glib-2.0 gio-2.0 gee-0.8 libpeas-1.0 libpeas-gtk-1.0 gtk+-3.0 granite gstreamer-1.0 gstreamer-pbutils-1.0 gstreamer-tag-1.0
