Commit 662d263f authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'kraxel/pixman.v5' into staging 



* kraxel/pixman.v5:
  pixman: cleanup properly on make distclean
  pixman: add licensing info
  pixman: build internal version early
  pixman: pass cflags, add -fPIC
  pixman: disable gtk
  pixman: set --host for cross builds
  pixman: add output dir to include path

Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents de148eb7 feb33ea7

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ subdir-pixman: pixman/Makefile 
	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pixman V="$(V)" all,)



pixman/Makefile: $(SRC_PATH)/pixman/configure

	(cd pixman; $(SRC_PATH)/pixman/configure --disable-shared --enable-static)

	(cd pixman; CFLAGS="$(CFLAGS) -fPIC" $(SRC_PATH)/pixman/configure $(AUTOCONF_HOST) --disable-gtk --disable-shared --enable-static)



$(SRC_PATH)/pixman/configure:

	(cd $(SRC_PATH)/pixman; autoreconf -v --install)
@@ -278,6 +278,7 @@ distclean: clean 
	for d in $(TARGET_DIRS) $(QEMULIBS); do \

	rm -rf $$d || exit 1 ; \

        done

	test -f pixman/config.log && make -C pixman distclean



KEYMAPS=da     en-gb  et  fr     fr-ch  is  lt  modifiers  no  pt-br  sv \

ar      de     en-us  fi  fr-be  hr     it  lv  nl         pl  ru     th \

configure

+16 −8
Original line number Diff line number Diff line
@@ -2121,11 +2121,10 @@ else 
    echo "      git submodule update --init pixman"

    exit 1

  fi

  pixman_cflags="-I${source_path}/pixman/pixman"

  pixman_libs="-Lpixman/pixman/.libs -lpixman-1"

  mkdir -p pixman/pixman

  pixman_cflags="-I\$(SRC_PATH)/pixman/pixman -I\$(BUILD_DIR)/pixman/pixman"

  pixman_libs="-L\$(BUILD_DIR)/pixman/pixman/.libs -lpixman-1"

fi

QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags"

libs_softmmu="$libs_softmmu $pixman_libs"



##########################################

# libcap probe
@@ -3137,6 +3136,10 @@ if test "$cpu" = "ppc64" -a "$targetos" != "Darwin" ; then 
  roms="$roms spapr-rtas"

fi



# add pixman flags after all config tests are done

QEMU_CFLAGS="$QEMU_CFLAGS $pixman_cflags"

libs_softmmu="$libs_softmmu $pixman_libs"



echo "Install prefix    $prefix"

echo "BIOS directory    `eval echo $qemu_datadir`"

echo "binary directory  `eval echo $bindir`"
@@ -3646,6 +3649,11 @@ if test "$sparse" = "yes" ; then 
  echo "HOST_CC      := REAL_CC=\"\$(HOST_CC)\" cgcc"  >> $config_host_mak

  echo "QEMU_CFLAGS  += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_host_mak

fi

if test "$cross_prefix" != ""; then

  echo "AUTOCONF_HOST := --host=${cross_prefix%-}"     >> $config_host_mak

else

  echo "AUTOCONF_HOST := "                             >> $config_host_mak

fi

echo "LDFLAGS=$LDFLAGS" >> $config_host_mak

echo "ARLIBS_BEGIN=$arlibs_begin" >> $config_host_mak

echo "ARLIBS_END=$arlibs_end" >> $config_host_mak
@@ -3948,9 +3956,6 @@ if test "$target_softmmu" = "yes" ; then 
  if test "$smartcard_nss" = "yes" ; then

    echo "subdir-$target: subdir-libcacard" >> $config_host_mak

  fi

  if test "$pixman" = "internal" ; then

    echo "subdir-$target: subdir-pixman" >> $config_host_mak

  fi

  case "$target_arch2" in

    i386|x86_64)

      echo "CONFIG_HAVE_CORE_DUMP=y" >> $config_target_mak
@@ -4148,13 +4153,16 @@ echo "QEMU_INCLUDES+=$includes" >> $config_target_mak 


done # for target in $targets



if [ "$pixman" = "internal" ]; then

  echo "config-host.h: subdir-pixman" >> $config_host_mak

fi



# build tree in object directory in case the source is not in the current directory

DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32"

DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas"

DIRS="$DIRS roms/seabios roms/vgabios"

DIRS="$DIRS qapi-generated"

DIRS="$DIRS libcacard libcacard/libcacard libcacard/trace"

DIRS="$DIRS pixman"

FILES="Makefile tests/tcg/Makefile qdict-test-data.txt"

FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit"

FILES="$FILES tests/tcg/lm32/Makefile libcacard/Makefile"

qemu-pixman.c

+5 −0
Original line number Diff line number Diff line 
/*

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 */



#include "qemu-pixman.h"



int qemu_pixman_get_type(int rshift, int gshift, int bshift)

qemu-pixman.h

+5 −0
Original line number Diff line number Diff line 
/*

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 */



#ifndef QEMU_PIXMAN_H

#define QEMU_PIXMAN_H