Remove sunxi-libump from sunxi-mali PKGBUILD

[franciscolourenco]

sunxi-libump was separeted into a different repository: https://github.com/linux-sunxi/libump It needs to be removed from sunxi-mali-fb-git PKGBUILD.

My naive attempt:

pkgbase=sunxi-mali-fb-git
pkgname=sunxi-mali-fb-git
true && pkgname=('sunxi-mali-fb-git')
_gitname=sunxi-mali
pkgver=30.d343311
pkgrel=1
pkgdesc="Mali implementation of OpenGL ES, OpenVG and EGL"
arch=('armv7h')
url="https://github.com/linux-sunxi/sunxi-mali"
license=('custom')
makedepends=('git' 'libdri2' 'libxfixes')
source=('git+https://github.com/linux-sunxi/sunxi-mali.git'
        'git+https://github.com/linux-sunxi/sunxi-mali-proprietary.git')
md5sums=('SKIP'
         'SKIP')

pkgver() {
  cd "${SRCDEST}/${_gitname}"
  echo $(git rev-list --count master).$(git rev-parse --short master)
}

prepare() {
  cd "${srcdir}/${_gitname}"
  rmdir lib/mali
  mv "${srcdir}/sunxi-mali-proprietary" lib/mali
  sed -i '/INSTALL_DATA/{p;:a;N;$!ba;d}' lib/mali/Makefile.mashup
  sed -i 's/INSTALL_DATA/INSTALL/' lib/mali/Makefile
  # sed -i 's/-ldri2/-ldri2 -lpthread/' lib/ump/Makefile
  # sed -i 's/INSTALL_DATA/INSTALL/' lib/ump/Makefile
}

build() {
  cd "${srcdir}/${_gitname}"
  make config VERSION=r3p0 ABI=armhf EGL_TYPE=framebuffer
  make prefix=/usr/
}

package_sunxi-mali-fb-git() {
  depends=('gcc-libs' 'libump')
  provides=('libmali' 'libegl' 'mesa=10.4.4')
  conflicts=('mesa')

  cd "${srcdir}/${_gitname}"

  make -C include DESTDIR="${pkgdir}" prefix=/usr/ install_egl install_gles install_gles2 install_khr

  install -m755 -d "${pkgdir}/usr/lib"
  make -C lib/mali DESTDIR="${pkgdir}" prefix=/usr/ libdir='$(DESTDIR)$(prefix)/lib/' install
  ln -s libMali.so "${pkgdir}/usr/lib/libEGL.so.1.4"
  ln -s libEGL.so.1.4 "${pkgdir}/usr/lib/libEGL.so.1"
  ln -s libEGL.so.1 "${pkgdir}/usr/lib/libEGL.so"
  ln -s libMali.so "${pkgdir}/usr/lib/libGLESv1_CM.so.1.1"
  ln -s libGLESv1_CM.so.1.1 "${pkgdir}/usr/lib/libGLESv1_CM.so.1"
  ln -s libGLESv1_CM.so.1 "${pkgdir}/usr/lib/libGLESv1_CM.so"
  ln -s libMali.so "${pkgdir}/usr/lib/libGLESv2.so.2.0"
  ln -s libGLESv2.so.2.0 "${pkgdir}/usr/lib/libGLESv2.so.2"
  ln -s libGLESv2.so.2 "${pkgdir}/usr/lib/libGLESv2.so"
}

# package_sunxi-mali-libump-git() {
#  depends=('libdri2' 'libxfixes')
#  provides=('libump')
#   cd "${srcdir}/${_gitname}"
#   install -m755 -d "${pkgdir}/usr/lib"
#   make -C include DESTDIR="${pkgdir}" prefix=/usr/ install_ump
#   make -C lib/ump DESTDIR="${pkgdir}" prefix=/usr/ install
#}

Results in:

$ makepkg -si
==> Making package: sunxi-mali-fb-git 30.d343311-1 (Thu Feb 26 22:15:50 WET 2015)
==> Checking runtime dependencies...
==> Checking buildtime dependencies...
==> Retrieving sources...
  -> Updating sunxi-mali git repo...
Fetching origin
  -> Updating sunxi-mali-proprietary git repo...
Fetching origin
==> Validating source files with md5sums...
    sunxi-mali ... Skipped
    sunxi-mali-proprietary ... Skipped
==> Extracting sources...
  -> Creating working copy of sunxi-mali git repo...
Reset branch 'makepkg'
  -> Creating working copy of sunxi-mali-proprietary git repo...
Switched to a new branch 'makepkg'
==> Starting pkgver()...
==> Starting prepare()...
==> Removing existing $pkgdir/ directory...
==> Starting build()...
rm -f config.mk
make config.mk
make[1]: Entering directory '/home/user/xbmc/xbmc_a10_archlinuxarm-master/sunxi-mali-fb-git/src/sunxi-mali'
make -f Makefile.config
make[2]: Entering directory '/home/user/xbmc/xbmc_a10_archlinuxarm-master/sunxi-mali-fb-git/src/sunxi-mali'
ABI="armhf" (Provided)
VERSION="r3p0" (Provided)
EGL_TYPE="framebuffer" (Provided)
ldd: warning: you do not have execution permission for `lib/mali/r3p0/armhf/framebuffer/libMali.so'
ldd: warning: you do not have execution permission for `lib/mali/r3p0/armhf/framebuffer/libMali.so'
Makefile.config:96: *** Missing library dependencies: libUMP.so.3.  Stop.
make[2]: Leaving directory '/home/user/xbmc/xbmc_a10_archlinuxarm-master/sunxi-mali-fb-git/src/sunxi-mali'
Makefile:12: recipe for target 'config.mk' failed
make[1]: *** [config.mk] Error 2
make[1]: Leaving directory '/home/user/xbmc/xbmc_a10_archlinuxarm-master/sunxi-mali-fb-git/src/sunxi-mali'
Makefile:8: recipe for target 'config' failed
make: *** [config] Error 2
==> ERROR: A failure occurred in build().
    Aborting...

Any tips appreciated.

[Fighter19]

I would guess you have to install libUMP first, unless you already have done so.

[franciscolourenco]

Yes I did install this one https://github.com/linux-sunxi/libump according to the instructions in the readme. Maybe it needs to be installed in a different location?