Date: Tuesday, August 8, 2017 @ 21:51:45 Author: alucryd Revision: 249633
archrelease: copy trunk to community-i686, community-x86_64 Added: pantheon-music/repos/ pantheon-music/repos/community-i686/ pantheon-music/repos/community-i686/PKGBUILD (from rev 249632, pantheon-music/trunk/PKGBUILD) pantheon-music/repos/community-i686/mesa-demos-conflict.patch (from rev 249632, pantheon-music/trunk/mesa-demos-conflict.patch) pantheon-music/repos/community-i686/pantheon-music-install-dirs.patch (from rev 249632, pantheon-music/trunk/pantheon-music-install-dirs.patch) pantheon-music/repos/community-x86_64/ pantheon-music/repos/community-x86_64/PKGBUILD (from rev 249632, pantheon-music/trunk/PKGBUILD) pantheon-music/repos/community-x86_64/mesa-demos-conflict.patch (from rev 249632, pantheon-music/trunk/mesa-demos-conflict.patch) pantheon-music/repos/community-x86_64/pantheon-music-install-dirs.patch (from rev 249632, pantheon-music/trunk/pantheon-music-install-dirs.patch) ----------------------------------------------------+ community-i686/PKGBUILD | 59 +++++++++++++++++++ community-i686/mesa-demos-conflict.patch | 36 +++++++++++ community-i686/pantheon-music-install-dirs.patch | 42 +++++++++++++ community-x86_64/PKGBUILD | 59 +++++++++++++++++++ community-x86_64/mesa-demos-conflict.patch | 36 +++++++++++ community-x86_64/pantheon-music-install-dirs.patch | 42 +++++++++++++ 6 files changed, 274 insertions(+) Copied: pantheon-music/repos/community-i686/PKGBUILD (from rev 249632, pantheon-music/trunk/PKGBUILD) =================================================================== --- repos/community-i686/PKGBUILD (rev 0) +++ repos/community-i686/PKGBUILD 2017-08-08 21:51:45 UTC (rev 249633) @@ -0,0 +1,59 @@ +# $Id$ +# Maintainer: Maxime Gauduin <alucryd at gmail dot com> + +pkgname=pantheon-music +pkgver=0.4.1 +pkgrel=1 +pkgdesc='The Pantheon Music Player' +arch=('i686' 'x86_64') +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' + 'libgranite.so') +makedepends=('cmake' 'gobject-introspection' 'intltool' '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=('cd7020b8ee3bb878ff1686a86a808b06ea51f08132152c3e27b10998e8b16f77' + '205f26c7dd613036739517620da37fea0f2a9f9d74ea546d5bce2c0a859f2792' + 'd0ebc710a742d942e04a8df61d91dd75ae4b2aeafe7fece08f1fbc90c507f1df') + +prepare() { + if [[ -d build ]]; then + rm -rf build + fi + mkdir build + + cd music-${pkgver} + + patch -Np1 -i ../mesa-demos-conflict.patch + patch -Np1 -i ../pantheon-music-install-dirs.patch +} + +build() { + cd build + + cmake ../music-${pkgver} \ + -DCMAKE_BUILD_TYPE='Release' \ + -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_INSTALL_LIBDIR='/usr/lib' \ + -DGSETTINGS_COMPILE='OFF' + make -j1 +} + +package() { + make DESTDIR="${pkgdir}" -C build install +} + +# vim: ts=2 sw=2 et: Copied: pantheon-music/repos/community-i686/mesa-demos-conflict.patch (from rev 249632, pantheon-music/trunk/mesa-demos-conflict.patch) =================================================================== --- repos/community-i686/mesa-demos-conflict.patch (rev 0) +++ repos/community-i686/mesa-demos-conflict.patch 2017-08-08 21:51:45 UTC (rev 249633) @@ -0,0 +1,36 @@ +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}) Copied: pantheon-music/repos/community-i686/pantheon-music-install-dirs.patch (from rev 249632, pantheon-music/trunk/pantheon-music-install-dirs.patch) =================================================================== --- repos/community-i686/pantheon-music-install-dirs.patch (rev 0) +++ repos/community-i686/pantheon-music-install-dirs.patch 2017-08-08 21:51:45 UTC (rev 249633) @@ -0,0 +1,42 @@ +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 Copied: pantheon-music/repos/community-x86_64/PKGBUILD (from rev 249632, pantheon-music/trunk/PKGBUILD) =================================================================== --- repos/community-x86_64/PKGBUILD (rev 0) +++ repos/community-x86_64/PKGBUILD 2017-08-08 21:51:45 UTC (rev 249633) @@ -0,0 +1,59 @@ +# $Id$ +# Maintainer: Maxime Gauduin <alucryd at gmail dot com> + +pkgname=pantheon-music +pkgver=0.4.1 +pkgrel=1 +pkgdesc='The Pantheon Music Player' +arch=('i686' 'x86_64') +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' + 'libgranite.so') +makedepends=('cmake' 'gobject-introspection' 'intltool' '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=('cd7020b8ee3bb878ff1686a86a808b06ea51f08132152c3e27b10998e8b16f77' + '205f26c7dd613036739517620da37fea0f2a9f9d74ea546d5bce2c0a859f2792' + 'd0ebc710a742d942e04a8df61d91dd75ae4b2aeafe7fece08f1fbc90c507f1df') + +prepare() { + if [[ -d build ]]; then + rm -rf build + fi + mkdir build + + cd music-${pkgver} + + patch -Np1 -i ../mesa-demos-conflict.patch + patch -Np1 -i ../pantheon-music-install-dirs.patch +} + +build() { + cd build + + cmake ../music-${pkgver} \ + -DCMAKE_BUILD_TYPE='Release' \ + -DCMAKE_INSTALL_PREFIX='/usr' \ + -DCMAKE_INSTALL_LIBDIR='/usr/lib' \ + -DGSETTINGS_COMPILE='OFF' + make -j1 +} + +package() { + make DESTDIR="${pkgdir}" -C build install +} + +# vim: ts=2 sw=2 et: Copied: pantheon-music/repos/community-x86_64/mesa-demos-conflict.patch (from rev 249632, pantheon-music/trunk/mesa-demos-conflict.patch) =================================================================== --- repos/community-x86_64/mesa-demos-conflict.patch (rev 0) +++ repos/community-x86_64/mesa-demos-conflict.patch 2017-08-08 21:51:45 UTC (rev 249633) @@ -0,0 +1,36 @@ +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}) Copied: pantheon-music/repos/community-x86_64/pantheon-music-install-dirs.patch (from rev 249632, pantheon-music/trunk/pantheon-music-install-dirs.patch) =================================================================== --- repos/community-x86_64/pantheon-music-install-dirs.patch (rev 0) +++ repos/community-x86_64/pantheon-music-install-dirs.patch 2017-08-08 21:51:45 UTC (rev 249633) @@ -0,0 +1,42 @@ +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