Merge pull request #9385 from MehdiChinoune/osqtquick-version
osgqtquick: Fix pkgver
This commit is contained in:
@@ -4,8 +4,9 @@ _realname=osgQtQuick
|
||||
pkgbase=mingw-w64-${_realname}-git
|
||||
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-git" "${MINGW_PACKAGE_PREFIX}-${_realname}-debug-git")
|
||||
_ver_base=2.0.0
|
||||
pkgver=2.0.0.r172
|
||||
pkgrel=5
|
||||
pkgver=2.0.0.r178
|
||||
pkgrel=1
|
||||
_commit=d4a0d17fa1981ead73e1697c3ff01252f51039c6
|
||||
pkgdesc="OpenSceneGraph QML Modules (mingw-w64)"
|
||||
arch=('any')
|
||||
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
|
||||
@@ -18,7 +19,7 @@ makedepends=("make"
|
||||
"${MINGW_PACKAGE_PREFIX}-osgQt-debug"
|
||||
"${MINGW_PACKAGE_PREFIX}-qt5-declarative")
|
||||
options=(!strip staticlibs !buildflags)
|
||||
source=(${_realname}::git+https://github.com/podsvirov/osgqtquick.git#branch=develop)
|
||||
source=(${_realname}::git+https://github.com/podsvirov/osgqtquick.git#commit=$_commit)
|
||||
sha256sums=('SKIP')
|
||||
|
||||
pkgver() {
|
||||
@@ -27,8 +28,8 @@ pkgver() {
|
||||
}
|
||||
|
||||
build() {
|
||||
[[ -d ${srcdir}/release-${MINGW_CHOST} ]] && rm -rf ${srcdir}/release-${MINGW_CHOST}
|
||||
mkdir -p ${srcdir}/release-${MINGW_CHOST} && cd ${srcdir}/release-${MINGW_CHOST}
|
||||
[[ -d ${srcdir}/release-${MSYSTEM} ]] && rm -rf ${srcdir}/release-${MSYSTEM}
|
||||
mkdir -p ${srcdir}/release-${MSYSTEM} && cd ${srcdir}/release-${MSYSTEM}
|
||||
|
||||
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
|
||||
${MINGW_PREFIX}/bin/cmake.exe \
|
||||
@@ -36,10 +37,10 @@ build() {
|
||||
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
../osgqtquick
|
||||
make
|
||||
cmake --build .
|
||||
|
||||
[[ -d ${srcdir}/debug-${MINGW_CHOST} ]] && rm -rf ${srcdir}/debug-${MINGW_CHOST}
|
||||
mkdir -p ${srcdir}/debug-${MINGW_CHOST} && cd ${srcdir}/debug-${MINGW_CHOST}
|
||||
[[ -d ${srcdir}/debug-${MSYSTEM} ]] && rm -rf ${srcdir}/debug-${MSYSTEM}
|
||||
mkdir -p ${srcdir}/debug-${MSYSTEM} && cd ${srcdir}/debug-${MSYSTEM}
|
||||
|
||||
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
|
||||
${MINGW_PREFIX}/bin/cmake.exe \
|
||||
@@ -47,6 +48,7 @@ build() {
|
||||
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
|
||||
-DCMAKE_BUILD_TYPE=Debug \
|
||||
../osgqtquick
|
||||
cmake --build .
|
||||
}
|
||||
|
||||
package_osgQtQuick-git() {
|
||||
@@ -57,8 +59,8 @@ package_osgQtQuick-git() {
|
||||
conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-svn")
|
||||
replaces=(${MINGW_PACKAGE_PREFIX}-${_realname}-svn)
|
||||
|
||||
cd ${srcdir}/release-${MINGW_CHOST}
|
||||
make DESTDIR=${pkgdir} install
|
||||
cd ${srcdir}/release-${MSYSTEM}
|
||||
DESTDIR=${pkgdir} cmake --install .
|
||||
}
|
||||
|
||||
package_osgQtQuick-debug-git() {
|
||||
@@ -70,8 +72,8 @@ package_osgQtQuick-debug-git() {
|
||||
conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-debug" "${MINGW_PACKAGE_PREFIX}-${_realname}-debug-svn")
|
||||
replaces=(${MINGW_PACKAGE_PREFIX}-${_realname}-debug-svn)
|
||||
|
||||
cd ${srcdir}/debug-${MINGW_CHOST}
|
||||
make DESTDIR=${pkgdir} install
|
||||
cd ${srcdir}/debug-${MSYSTEM}
|
||||
DESTDIR=${pkgdir} cmake --install .
|
||||
|
||||
rm -rf ${pkgdir}${MINGW_PREFIX}/include
|
||||
rm -rf ${pkgdir}${MINGW_PREFIX}/lib/cmake/osgQtQuick/osgQtQuickConfig.cmake
|
||||
|
||||
Reference in New Issue
Block a user