From bf9162c54818339eaada0723267b049e9597b105 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 8 Sep 2013 19:00:41 +0200 Subject: [PATCH] pixman: convert to new package format Signed-off-by: Stephan Raue --- packages/x11/lib/pixman/build | 62 -------------------- packages/x11/lib/pixman/install | 26 -------- packages/x11/lib/pixman/{meta => package.mk} | 32 +++++++++- 3 files changed, 30 insertions(+), 90 deletions(-) delete mode 100755 packages/x11/lib/pixman/build delete mode 100755 packages/x11/lib/pixman/install rename packages/x11/lib/pixman/{meta => package.mk} (57%) diff --git a/packages/x11/lib/pixman/build b/packages/x11/lib/pixman/build deleted file mode 100755 index 98b5b2e4de..0000000000 --- a/packages/x11/lib/pixman/build +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -if [ "$TARGET_ARCH" = arm ]; then - if [ "$TARGET_FPU" = neon -o "$TARGET_FPU" = neon-fp16 ]; then - CFG_NEON="--enable-arm-neon" - else - CFG_NEON="--disable-arm-neon" - fi - ARCH_CONFIG="--disable-mmx --disable-sse2 --disable-vmx --enable-arm-simd $CFG_NEON --disable-arm-iwmmxt" -elif [ "$TARGET_ARCH" = i386 -o "$TARGET_ARCH" = x86_64 ]; then - ARCH_CONFIG="--enable-mmx --enable-sse2 --disable-vmx --disable-arm-simd --disable-arm-neon" -fi - -cd $PKG_BUILD -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-silent-rules \ - --enable-shared \ - --disable-static \ - --disable-openmp \ - --disable-loongson-mmi \ - $ARCH_CONFIG \ - --disable-mips-dspr2 \ - --enable-gcc-inline-asm \ - --disable-timers \ - --disable-gtk \ - --disable-libpng \ - --with-gnu-ld - -echo "" > test/Makefile.am - -make -$MAKEINSTALL - -cp $SYSROOT_PREFIX/usr/lib/pkgconfig/pixman-1.pc \ - $SYSROOT_PREFIX/usr/lib/pkgconfig/pixman.pc -cp -rf $SYSROOT_PREFIX/usr/include/pixman-1 \ - $SYSROOT_PREFIX/usr/include/pixman diff --git a/packages/x11/lib/pixman/install b/packages/x11/lib/pixman/install deleted file mode 100755 index 31b32b8cf9..0000000000 --- a/packages/x11/lib/pixman/install +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -mkdir -p $INSTALL/usr/lib - cp -P $PKG_BUILD/pixman/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/x11/lib/pixman/meta b/packages/x11/lib/pixman/package.mk similarity index 57% rename from packages/x11/lib/pixman/meta rename to packages/x11/lib/pixman/package.mk index 5ed83b3386..b70877a1b3 100644 --- a/packages/x11/lib/pixman/meta +++ b/packages/x11/lib/pixman/package.mk @@ -26,11 +26,39 @@ PKG_LICENSE="OSS" PKG_SITE="http://www.x.org/" PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain util-macros" +PKG_BUILD_DEPENDS_TARGET="toolchain util-macros" PKG_PRIORITY="optional" PKG_SECTION="x11/lib" PKG_SHORTDESC="pixman: Pixel manipulation library" PKG_LONGDESC="Pixman is a generic library for manipulating pixel regions, contains low-level pixel manipulation routines and is used by both xorg and cairo." -PKG_IS_ADDON="no" +PKG_IS_ADDON="no" PKG_AUTORECONF="yes" + +if [ "$TARGET_ARCH" = arm ]; then + if [ "$TARGET_FPU" = neon -o "$TARGET_FPU" = neon-fp16 ]; then + PIXMAN_NEON="--enable-arm-neon" + else + PIXMAN_NEON="--disable-arm-neon" + fi + PIXMAN_CONFIG="--disable-mmx --disable-sse2 --disable-vmx --enable-arm-simd $PIXMAN_NEON --disable-arm-iwmmxt" +elif [ "$TARGET_ARCH" = i386 -o "$TARGET_ARCH" = x86_64 ]; then + PIXMAN_CONFIG="--enable-mmx --enable-sse2 --disable-vmx --disable-arm-simd --disable-arm-neon" +fi + +PKG_CONFIGURE_OPTS_TARGET="--disable-openmp \ + --disable-loongson-mmi \ + $PIXMAN_CONFIG \ + --disable-mips-dspr2 \ + --enable-gcc-inline-asm \ + --disable-timers \ + --disable-gtk \ + --disable-libpng \ + --with-gnu-ld" + +post_makeinstall_target() { + cp $SYSROOT_PREFIX/usr/lib/pkgconfig/pixman-1.pc \ + $SYSROOT_PREFIX/usr/lib/pkgconfig/pixman.pc + cp -rf $SYSROOT_PREFIX/usr/include/pixman-1 \ + $SYSROOT_PREFIX/usr/include/pixman +}