diff options
author | Matt Parnell | 2016-06-18 23:16:51 -0500 |
---|---|---|
committer | Matt Parnell | 2016-06-18 23:16:51 -0500 |
commit | 65c9f0069507452eea0b1e7437c02b102a6b5037 (patch) | |
tree | 477420cf8547ee965fff887f0ec16985eeb1163f | |
parent | 2b34bc2ccebf467749081bf0c3c8c32b01790300 (diff) | |
download | aur-65c9f0069507452eea0b1e7437c02b102a6b5037.tar.gz |
Revert "we can once more build using no binaries"
This reverts commit 2b34bc2ccebf467749081bf0c3c8c32b01790300.
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 64 |
2 files changed, 14 insertions, 58 deletions
@@ -1,7 +1,7 @@ # Generated by mksrcinfo v8 -# Sun Jun 19 04:15:23 UTC 2016 +# Fri Jun 17 06:02:57 UTC 2016 pkgbase = nightingale-git - pkgdesc = No binaries used. Open source fork of the Songbird Media Player with updates and fixes. + pkgdesc = Open source fork of the Songbird Media Player. Uses prebuilt xulrunner and sqlite. pkgver = 78bd501 pkgrel = 1 url = http://getnightingale.com/ @@ -46,10 +46,10 @@ pkgbase = nightingale-git provides = nightingale conflicts = nightingale source = nightingale-hacking::git://github.com/nightingale-media-player/nightingale-hacking.git#branch=gstreamer-1.0 - source = nightingale-deps::git://github.com/nightingale-media-player/nightingale-deps.git#branch=xul-192-new + source = https://bitbucket.org/nightingale-media-player/nightingale-deps/downloads/linux--1.12-20130316-release-final.tar.lzma source = Nightingale.desktop md5sums = SKIP - md5sums = SKIP + md5sums = a9b47ef0b21106f6b51231046e1758d1 md5sums = 7741cc247648e95dd9dad8c953616757 pkgname = nightingale-git @@ -4,7 +4,7 @@ pkgname="nightingale-git" pkgver=78bd501 pkgrel=1 -pkgdesc="No binaries used. Open source fork of the Songbird Media Player with updates and fixes." +pkgdesc="Open source fork of the Songbird Media Player. Uses prebuilt xulrunner and sqlite." arch=('i686' 'x86_64') url="http://getnightingale.com/" license=('GPL2' 'MPL' 'BSD') @@ -16,10 +16,10 @@ conflicts=('nightingale') provides=('nightingale') install="nightingale.install" source=("nightingale-hacking::git://github.com/nightingale-media-player/nightingale-hacking.git#branch=gstreamer-1.0" - "nightingale-deps::git://github.com/nightingale-media-player/nightingale-deps.git#branch=xul-192-new" + "https://bitbucket.org/nightingale-media-player/nightingale-deps/downloads/linux-${CARCH}-1.12-20130316-release-final.tar.lzma" "Nightingale.desktop") md5sums=('SKIP' - 'SKIP' + 'a9b47ef0b21106f6b51231046e1758d1' '7741cc247648e95dd9dad8c953616757') pkgver() { @@ -33,63 +33,19 @@ prepare() { echo 'ac_add_options --with-gstreamer-1.0' >> "${srcdir}/nightingale-hacking/nightingale.config" echo 'ac_add_options --with-taglib-source=system' >> "${srcdir}/nightingale-hacking/nightingale.config" echo 'ac_add_options --enable-official' >> "${srcdir}/nightingale-hacking/nightingale.config" + + cd "${srcdir}/nightingale-hacking/dependencies" + ln -sf "${srcdir}/linux-${CARCH}" ./ } -build() { - msg "Building static dependencies xulrunner and sqlite..." - - # it makes more sense to me to force a fresh build of everything - # so i am now - if [ -d "${srcdir}/linux-${CARCH}" ]; then - rm -rf "${srcdir}/linux-${CARCH}" - fi - - if [ -d "${srcdir}/nightingale-hacking/dependencies/linux-${CARCH}" ]; then - rm -rf "${srcdir}/nightingale-hacking/dependencies/linux-${CARCH}" - fi - - mkdir "${srcdir}/linux-${CARCH}" - - # for whatever reason the lack of the below broke sqlite - # it for whatever reason builds both versions without a make target for release only - mkdir -p "${srcdir}/linux-${CARCH}/sqlite/debug" - mkdir -p "${srcdir}/linux-${CARCH}/sqlite/release" - mkdir -p "${srcdir}/linux-${CARCH}/xulrunner-1.9.2/release" - - cd "${srcdir}/nightingale-deps" - - # xul 1.9.2 won't build without this - unset CPPFLAGS +build() { + cd "${srcdir}/nightingale-hacking" - export SB_VENDOR_BINARIES_CO_ROOT=${srcdir} - export SB_VENDOR_BUILD_ROOT=${srcdir} - export CXXFLAGS="$CXXFLAGS -fpermissive" - - # gcc6 and higher doesn't play nice with ngale and deps export CC=gcc-5 export CXX=g++-5 - - echo "export CC=gcc-5" >> "${srcdir}/nightingale-deps/xulrunner-1.9.2/mozconfigs/xulrunner.linux.release.${CARCH}.mozconfig" - echo "export CXX=g++-5" >> "${srcdir}/nightingale-deps/xulrunner-1.9.2/mozconfigs/xulrunner.linux.release.${CARCH}.mozconfig" - - msg2 "Building xulrunner 1.9.2...\n" - make -C xulrunner-1.9.2 -f Makefile.songbird xr-build-release - make -C xulrunner-1.9.2 -f Makefile.songbird xr-packaging-release - - msg2 "Building sqlite...\n" - cd sqlite - autoreconf --force --install - cd .. - make -C sqlite -f Makefile.songbird - strip --strip-all "${srcdir}/linux-$(uname -m)/sqlite/release/bin/sqlite3" - strip --strip-debug "${srcdir}/linux-$(uname -m)/sqlite/release/lib/libsqlite3.a" - - mv "${srcdir}/linux-${CARCH}" "${srcdir}/nightingale-hacking/dependencies/" - - msg2 "Building Nightingale...\n" - cd "${srcdir}/nightingale-hacking" + make - + # copy the add-ons first [ -d ../xpi-stage ] && rm -rf ../xpi-stage cp -a "${srcdir}/nightingale-hacking/compiled/xpi-stage" "${srcdir}" |