Change pacman to use current git revision

This commit is contained in:
Jonas Kvinge 2019-02-22 22:57:53 +01:00
parent dc04961699
commit 1a0bc75629
2 changed files with 10 additions and 15 deletions

View File

@ -84,8 +84,8 @@ if(GIT_REVISION)
set(STRAWBERRY_VERSION_PACKAGE "${GIT_TAGNAME}.${GIT_COMMITCOUNT}.${GIT_SHA1}") set(STRAWBERRY_VERSION_PACKAGE "${GIT_TAGNAME}.${GIT_COMMITCOUNT}.${GIT_SHA1}")
set(STRAWBERRY_VERSION_RPM_V "${GIT_TAGNAME}") set(STRAWBERRY_VERSION_RPM_V "${GIT_TAGNAME}")
set(STRAWBERRY_VERSION_RPM_R "2.${GIT_COMMITCOUNT}.${GIT_SHA1}") set(STRAWBERRY_VERSION_RPM_R "2.${GIT_COMMITCOUNT}.${GIT_SHA1}")
set(STRAWBERRY_VERSION_PAC_V "${GIT_TAGNAME}") set(STRAWBERRY_VERSION_PAC_V "${GIT_TAGNAME}.r${GIT_COMMITCOUNT}.${GIT_SHA1}")
set(STRAWBERRY_VERSION_PAC_R "${GIT_COMMITCOUNT}") set(STRAWBERRY_VERSION_PAC_R "1")
endif() endif()

View File

@ -40,30 +40,25 @@ optdepends=(
) )
provides=(strawberry) provides=(strawberry)
conflicts=(strawberry) conflicts=(strawberry)
source=("git+https://github.com/jonaski/strawberry.git") source=("strawberry-@STRAWBERRY_VERSION_PACKAGE@.tar.xz")
sha256sums=('SKIP') sha256sums=('SKIP')
pkgver() {
cd "strawberry"
git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}
prepare() { prepare() {
cd "${srcdir}/strawberry" mkdir -p build
install -d strawberry-build
} }
build() { build() {
cd "${srcdir}/strawberry/strawberry-build" cd build
cmake .. \ cmake ../$pkgname-@STRAWBERRY_VERSION_PACKAGE@ \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DUSE_SYSTEM_TAGLIB=ON \ -DUSE_SYSTEM_TAGLIB=ON \
-DENABLE_STREAM_DEEZER=ON \ -DENABLE_STREAM_DEEZER=ON \
-DENABLE_PHONON=ON -DENABLE_PHONON=ON \
make -DENABLE_TRANSLATIONS=ON
make -j$(nproc)
} }
package() { package() {
cd "${srcdir}/strawberry/strawberry-build" cd build
make DESTDIR="${pkgdir}" install make DESTDIR="${pkgdir}" install
} }