diff options
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PKGBUILD | 42 |
3 files changed, 49 insertions, 12 deletions
@@ -10,6 +10,12 @@ pkgbase = glxosd-fix-git makedepends = gcc makedepends = git makedepends = boost + source = git://github.com/nickguletskii/GLXOSD.git + source = GLXOSD32::git://github.com/Phitherek/GLXOSD.git + md5sums = SKIP + md5sums = SKIP + +pkgname = glxosd-fix-git depends = mesa depends = glu depends = fontconfig @@ -18,8 +24,14 @@ pkgbase = glxosd-fix-git depends = libxext provides = glxosd conflicts = glxosd - source = git://github.com/nickguletskii/GLXOSD.git - md5sums = SKIP -pkgname = glxosd-fix-git +pkgname = lib32-glxosd-fix-git + depends = lib32-mesa + depends = lib32-glu + depends = lib32-fontconfig + depends = lib32-freetype2 + depends = lib32-lm_sensors + depends = lib32-libxext + provides = lib32-glxosd + conflicts = lib32-glxosd diff --git a/.gitignore b/.gitignore index 07bdbf30c50a..29a50b3cf902 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ /pkg /src /GLXOSD +/GLXOSD32 *.tar.gz @@ -1,6 +1,5 @@ # Maintainer: Franc[e]sco <lolisamurai@tfwno.gf> -pkgname=glxosd-fix-git -provides=('glxosd-git') +pkgname=('glxosd-fix-git' 'lib32-glxosd-fix-git') _gitname=GLXOSD pkgver=r209.dbb44b7 pkgrel=1 @@ -8,12 +7,9 @@ pkgdesc="(no nvidia proprietary dep, fix compile errors) An OSD for OpenGL appli arch=('i686' 'x86_64') url="https://github.com/nickguletskii/GLXOSD" license=('GPL') -depends=('mesa' 'glu' 'fontconfig' 'freetype2' 'lm_sensors' 'libxext') makedepends=('cmake' 'gcc' 'git' 'boost') -provides=('glxosd') -conflicts=('glxosd') -source=('git://github.com/nickguletskii/GLXOSD.git') -md5sums=('SKIP') +source=('git://github.com/nickguletskii/GLXOSD.git' 'GLXOSD32::git://github.com/Phitherek/GLXOSD.git') +md5sums=('SKIP' 'SKIP') pkgver() { cd "${srcdir}/$_gitname" @@ -25,15 +21,31 @@ prepare() { git submodule init git submodule update --recursive patch --forward --strip=1 --input="${startdir}/glxosd-fix.patch" + cd "$srcdir/${_gitname}32" + git checkout 32bit + git submodule init + git submodule update --recursive + patch --forward --strip=1 --input="${startdir}/glxosd-fix.patch" } build() { - cd "$srcdir/GLXOSD" + cd "$srcdir/$_gitname" cmake -DCMAKE_INSTALL_PREFIX=/usr -G "Unix Makefiles" make all + cd "$srcdir/${_gitname}32" + export CC='gcc -m32' + export CXX='g++ -m32' + export CMAKE_C_FLAGS='-m32' + export CMAKE_CXX_FLAGS='-m32' + export PKG_CONFIG_PATH='/usr/lib32/pkgconfig' + cmake -DLIB_SUFFIX=32 -DCMAKE_INSTALL_PREFIX=/usr -G "Unix Makefiles" + make all } -package() { +package_glxosd-fix-git() { + provides=('glxosd') + conflicts=('glxosd') + depends=('mesa' 'glu' 'fontconfig' 'freetype2' 'lm_sensors' 'libxext') cd "$srcdir/$_gitname" make DESTDIR="$pkgdir/" install @@ -46,3 +58,15 @@ package() { sed -i 's+/usr//lib/i386-linux-gnu//glxosd+/usr/lib/glxosd+g' \ "$pkgdir/usr/bin/glxosd" } + +package_lib32-glxosd-fix-git() { + provides=('lib32-glxosd') + conflicts=('lib32-glxosd') + depends=('lib32-mesa' 'lib32-glu' 'lib32-fontconfig' 'lib32-freetype2' 'lib32-lm_sensors' + 'lib32-libxext') + cd "$srcdir/${_gitname}32" + make DESTDIR="$pkgdir/" install + sed -i 's+/usr//lib/x86_64-linux-gnu//glxosd/+/usr/lib/glxosd+g' $pkgdir/usr/bin/glxosd32 + sed -i 's+/usr//lib/i386-linux-gnu//glxosd+/usr/lib/glxosd+g' $pkgdir/usr/bin/glxosd32 + mv ${pkgdir}/usr/lib ${pkgdir}/usr/lib32 +} |