Commit c12b6d70 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

pixman: drop submodule 



Drop pixman submodule and support for the "internal" pixman build.
pixman should be reasonably well established meanwhile so we don't
need the fallback submodule any more.  While being at it also drop
some #ifdefs for pixman versions older than what we require in
configure anyway.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Message-id: 20170905140116.28181-2-kraxel@redhat.com
parent 619c200f

.gitmodules

+0 −3
Original line number Diff line number Diff line
@@ -22,9 +22,6 @@ 
[submodule "roms/sgabios"]

	path = roms/sgabios

	url = git://git.qemu-project.org/sgabios.git

[submodule "pixman"]

	path = pixman

	url = git://anongit.freedesktop.org/pixman

[submodule "dtc"]

	path = dtc

	url = git://git.qemu-project.org/dtc.git

Makefile

+0 −10
Original line number Diff line number Diff line
@@ -325,15 +325,6 @@ $(SOFTMMU_SUBDIR_RULES): config-all-devices.mak 
subdir-%:

	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" TARGET_DIR="$*/" all,)



subdir-pixman: pixman/Makefile

	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pixman V="$(V)" all,)



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

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



$(SRC_PATH)/pixman/configure:

	(cd $(SRC_PATH)/pixman; autoreconf -v --install)



DTC_MAKE_ARGS=-I$(SRC_PATH)/dtc VPATH=$(SRC_PATH)/dtc -C dtc V="$(V)" LIBFDT_srcdir=$(SRC_PATH)/dtc/libfdt

DTC_CFLAGS=$(CFLAGS) $(QEMU_CFLAGS)

DTC_CPPFLAGS=-I$(BUILD_DIR)/dtc -I$(SRC_PATH)/dtc -I$(SRC_PATH)/dtc/libfdt
@@ -541,7 +532,6 @@ distclean: clean 
	rm -rf $$d || exit 1 ; \

        done

	rm -Rf .sdk

	if test -f pixman/config.log; then $(MAKE) -C pixman distclean; fi

	if test -f dtc/version_gen.h; then $(MAKE) $(DTC_MAKE_ARGS) clean; fi



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

configure

+2 −18
Original line number Diff line number Diff line
@@ -925,8 +925,6 @@ for opt do 
  ;;

  --with-system-pixman) pixman="system"

  ;;

  --without-system-pixman) pixman="internal"

  ;;

  --without-pixman) pixman="none"

  ;;

  --disable-sdl) sdl="no"
@@ -3300,8 +3298,6 @@ if test "$pixman" = ""; then 
    pixman="none"

  elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then

    pixman="system"

  else

    pixman="internal"

  fi

fi

if test "$pixman" = "none"; then
@@ -3318,16 +3314,8 @@ elif test "$pixman" = "system"; then 
  pixman_cflags=$($pkg_config --cflags pixman-1)

  pixman_libs=$($pkg_config --libs pixman-1)

else

  if test ! -d ${source_path}/pixman/pixman; then

    error_exit "pixman >= 0.21.8 not present. Your options:" \

        "  (1) Preferred: Install the pixman devel package (any recent" \

        "      distro should have packages as Xorg needs pixman too)." \

        "  (2) Fetch the pixman submodule, using:" \

        "      git submodule update --init pixman"

  fi

  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"

  error_exit "pixman >= 0.21.8 not present." \

      "Please install the pixman devel package."

fi



##########################################
@@ -6529,10 +6517,6 @@ echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak 


done # for target in $targets



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

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

fi



if [ "$dtc_internal" = "yes" ]; then

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

fi

pixman @ 87eea99e

Original line number Diff line number Diff line 
Subproject commit 87eea99e443b389c978cf37efc52788bf03a0ee0

ui/qemu-pixman.c

+0 −4
Original line number Diff line number Diff line
@@ -96,17 +96,13 @@ int qemu_pixman_get_type(int rshift, int gshift, int bshift) 
        if (bshift == 0) {

            type = PIXMAN_TYPE_ARGB;

        } else {

#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0, 21, 8)

            type = PIXMAN_TYPE_RGBA;

#endif

        }

    } else if (rshift < gshift && gshift < bshift) {

        if (rshift == 0) {

            type = PIXMAN_TYPE_ABGR;

        } else {

#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0, 16, 0)

            type = PIXMAN_TYPE_BGRA;

#endif

        }

    }

    return type;