summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO28
-rw-r--r--.gitignore8
-rw-r--r--PKGBUILD133
3 files changed, 82 insertions, 87 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1669072c5c28..3d189aa247e1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,21 @@
pkgbase = gallium-nine-git
- pkgdesc = Gallium Nine Standalone (Git Version)
- pkgver = 0.r167.4380a4c
+ pkgdesc = Gallium Nine Standalone
+ pkgver = 0.9.r8.g95e0da4
pkgrel = 1
url = https://github.com/iXit/wine-nine-standalone
arch = x86_64
- license = LGPL2
+ license = LGPL-2.1-or-later
makedepends = git
- makedepends = wine
- makedepends = mesa
+ makedepends = lib32-mesa
makedepends = meson
- source = git+https://github.com/iXit/wine-nine-standalone.git
- sha512sums = SKIP
-
-pkgname = gallium-nine-git
- depends = mesa
- provides = gallium-nine
+ makedepends = wine
+ provides = gallium-nine=0.9
+ provides = wine-nine=0.9
conflicts = gallium-nine
+ conflicts = wine-nine
+ source = ixit.gallium-nine::git+https://github.com/iXit/wine-nine-standalone.git
+ sha256sums = SKIP
-pkgname = lib32-gallium-nine-git
- depends = gallium-nine
+pkgname = gallium-nine-git
depends = lib32-mesa
- provides = lib32-gallium-nine
- conflicts = lib32-gallium-nine
-
+ depends = wine
diff --git a/.gitignore b/.gitignore
index 309e901ecc9a..018a3de08144 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-pkg/
-src/
-wine-nine-standalone/
-*.tar* \ No newline at end of file
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index c00dbd965f3f..89d63732276c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,84 +1,83 @@
-# Maintainer: Jason Stryker <inbox at jasonstryker dot com>
+# Maintainer:
+# Contributor: Jason Stryker <inbox at jasonstryker dot com>
# Contributor: AdriƠ Cereto i MassaguƩ <ssorgatem at gmail.com>
-pkgbase=gallium-nine-git
-pkgname=('gallium-nine-git' 'lib32-gallium-nine-git')
-pkgver=0.r272.966fc5c
+_pkgname="gallium-nine"
+pkgname="$_pkgname-git"
+pkgver=0.9.r8.g95e0da4
pkgrel=1
-pkgdesc="Gallium Nine Standalone (Git Version)"
-arch=('x86_64')
+pkgdesc="Gallium Nine Standalone"
url="https://github.com/iXit/wine-nine-standalone"
-license=('LGPL2')
-makedepends=('git' 'wine' 'mesa' 'meson')
-source=("git+https://github.com/iXit/wine-nine-standalone.git")
-sha512sums=('SKIP')
+license=('LGPL-2.1-or-later')
+arch=('x86_64')
+
+makedepends=(
+ 'git'
+ 'lib32-mesa'
+ 'meson'
+ 'wine'
+)
+
+provides=(
+ "$_pkgname=${pkgver%%.r*}"
+ "wine-nine=${pkgver%%.r*}"
+)
+conflicts=(
+ "$_pkgname"
+ "wine-nine"
+)
+
+_pkgsrc="ixit.gallium-nine"
+source=("$_pkgsrc"::"git+$url.git")
+sha256sums=('SKIP')
pkgver() {
- cd wine-nine-standalone
- printf "0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+ cd "$_pkgsrc"
+ git describe --long --tags --abbrev=7 | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
build() {
- cd ${srcdir}/wine-nine-standalone
-
- sed -i "s#^BASE=.*#BASE=/usr/share/nine#g" "tools/nine-install.sh"
-
- sed "s/@PKG_CONFIG@/i686-pc-linux-gnu-pkg-config/" \
- < tools/cross-wine32.in \
- > tools/cross-wine32
-
- sed "s/@PKG_CONFIG@/x86_64-pc-linux-gnu-pkg-config/" \
- < tools/cross-wine64.in \
- > tools/cross-wine64
-
- meson \
- --cross-file "tools/cross-wine64" \
- --buildtype "release" \
- --prefix "/usr/share/nine" \
- --bindir bin64 \
- --libdir lib64 \
- "build64"
-
- ninja -C "build64"
-
- meson \
- --cross-file "tools/cross-wine32" \
- --buildtype "release" \
- --prefix "/usr/share/nine" \
- --bindir bin32 \
- --libdir lib32 \
- "build32"
-
- ninja -C "build32"
-
+ cd "$_pkgsrc"
+
+ ./bootstrap.sh --distro arch
+
+ meson \
+ --cross-file "tools/cross-wine64" \
+ --buildtype "release" \
+ --prefix "/" \
+ --bindir bin \
+ --libdir lib \
+ "build64"
+
+ ninja -C "build64"
+ DESTDIR="$srcdir/fakeinstall" ninja -C build64 install
+
+ meson \
+ --cross-file "tools/cross-wine32" \
+ --buildtype "release" \
+ --prefix "/" \
+ --bindir bin32 \
+ --libdir lib32 \
+ "build32"
+
+ ninja -C "build32"
+ DESTDIR="$srcdir/fakeinstall" ninja -C build32 install
}
-_package_gallium-nine-git() {
-
- cd ${srcdir}/wine-nine-standalone
+package() {
+ depends=('lib32-mesa' 'wine')
- DESTDIR="$pkgdir" ninja -C "build$1" install
+ install -m 755 -d "${pkgdir}"/usr/lib{,32}/wine/{x86_64-{unix,windows},i386-{unix,windows}}
-}
-
-package_gallium-nine-git() {
- provides=("gallium-nine")
- conflicts=("gallium-nine")
- depends=('mesa')
-
- _package_gallium-nine-git 64
-
- mkdir -p "$pkgdir/usr/bin"
- install -Dm 0755 "tools/nine-install.sh" "${pkgdir}/usr/bin/nine-install"
-
-}
+ install -m 755 "${srcdir}/fakeinstall"/bin/ninewinecfg.exe.so "${pkgdir}"/usr/lib/wine/x86_64-unix/ninewinecfg.exe.so
+ install -m 755 "${srcdir}/fakeinstall"/bin/ninewinecfg.exe.fake "${pkgdir}"/usr/lib/wine/x86_64-windows/ninewinecfg.exe
-package_lib32-gallium-nine-git() {
- provides=("lib32-gallium-nine")
- conflicts=("lib32-gallium-nine")
- depends=('gallium-nine' 'lib32-mesa')
+ install -m 755 "${srcdir}/fakeinstall"/bin32/ninewinecfg.exe.so "${pkgdir}"/usr/lib32/wine/i386-unix/ninewinecfg.exe.so
+ install -m 755 "${srcdir}/fakeinstall"/bin32/ninewinecfg.exe.fake "${pkgdir}"/usr/lib32/wine/i386-windows/ninewinecfg.exe
- _package_gallium-nine-git 32
+ install -m 755 "${srcdir}/fakeinstall"/lib/d3d9-nine.dll.so "${pkgdir}"/usr/lib/wine/x86_64-unix/d3d9-nine.dll.so
+ install -m 755 "${srcdir}/fakeinstall"/lib/d3d9-nine.dll.fake "${pkgdir}"/usr/lib/wine/x86_64-windows/d3d9-nine.dll
+ install -m 755 "${srcdir}/fakeinstall"/lib32/d3d9-nine.dll.so "${pkgdir}"/usr/lib32/wine/i386-unix/d3d9-nine.dll.so
+ install -m 755 "${srcdir}/fakeinstall"/lib32/d3d9-nine.dll.fake "${pkgdir}"/usr/lib32/wine/i386-windows/d3d9-nine.dll
}
-# vim:set ts=2 sw=2 et: