Hello community, here is the log from the commit of package intel-gpu-tools for openSUSE:Factory checked in at 2017-02-10 09:47:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/intel-gpu-tools (Old) and /work/SRC/openSUSE:Factory/.intel-gpu-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "intel-gpu-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/intel-gpu-tools/intel-gpu-tools.changes 2017-01-18 21:29:44.914907558 +0100 +++ /work/SRC/openSUSE:Factory/.intel-gpu-tools.new/intel-gpu-tools.changes 2017-02-10 09:47:56.359052022 +0100 @@ -1,0 +2,8 @@ +Sun Feb 5 12:30:23 UTC 2017 - [email protected] + +- Add u_respect_cflags.diff +- supersedes N_intel-gpu-tools_Fix_libkmod.h_include_path_1320.patch, + N_intel-gpu-tools_Fix_libkmod.h_include_path_1315.patch, + N_intel-gpu-tools_Fix_libkmod.h_include_path.patch + +------------------------------------------------------------------- Old: ---- N_intel-gpu-tools_Fix_libkmod.h_include_path.patch N_intel-gpu-tools_Fix_libkmod.h_include_path_1315.patch N_intel-gpu-tools_Fix_libkmod.h_include_path_1320.patch New: ---- u_respect_cflags.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ intel-gpu-tools.spec ++++++ --- /var/tmp/diff_new_pack.ix283x/_old 2017-02-10 09:47:56.994961942 +0100 +++ /var/tmp/diff_new_pack.ix283x/_new 2017-02-10 09:47:56.994961942 +0100 @@ -26,10 +26,7 @@ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2 Patch0: n_disable-build-of-pm_rpm.patch Patch2: u_%{name}-1.7-fix-bashisms.patch -# PATCH-FIX-openSUSE: Fix kmod.h include path -Patch100: N_intel-gpu-tools_Fix_libkmod.h_include_path_1315.patch -Patch101: N_intel-gpu-tools_Fix_libkmod.h_include_path_1320.patch -Patch102: N_intel-gpu-tools_Fix_libkmod.h_include_path.patch +Patch3: u_respect_cflags.diff BuildRequires: i2c-tools BuildRequires: libtool BuildRequires: pkg-config @@ -60,18 +57,10 @@ DRM driver. %prep -%setup -q -n %{name}-%{version} +%setup -q %patch0 %patch2 -%if 0%{?suse_version} == 1315 -%patch100 -%endif -%if 0%{?suse_version} == 1320 -%patch101 -%endif -%if 0%{?suse_version} != 1315 && 0%{?suse_version} != 1320 -%patch102 -%endif +%patch3 -p1 %build autoreconf -fi ++++++ u_respect_cflags.diff ++++++ From: Jan Engelhardt <[email protected]> Date: 2017-02-05 13:15:36.359677297 +0100 Subject: build: resolve build error due to improper CFLAGS 1. intel-gpu-tools failed to use LIBKMOD_CFLAGS, which can lead to build errors if libkmod is in a non-default location. 2. CFLAGS obtained from pkg-config are really CPPFLAGS and should go there (AM_CPPFLAGS). 3. The target-specific CFLAGS overrides are unnecessary, since there are no conflicting settings obtained from pkg-config. --- tests/Makefile.am | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) Index: intel-gpu-tools-1.17/tests/Makefile.am =================================================================== --- intel-gpu-tools-1.17.orig/tests/Makefile.am +++ intel-gpu-tools-1.17/tests/Makefile.am @@ -53,18 +53,17 @@ EXTRA_DIST = $(common_files) $(check_SCR CLEANFILES = $(EXTRA_PROGRAMS) test-list.txt test-list-full.txt .gitignore -AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) -Wno-unused-result $(DEBUG_CFLAGS)\ - -I$(srcdir)/.. \ - -I$(srcdir)/../lib \ +AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../lib \ -include "$(srcdir)/../lib/check-ndebug.h" \ + $(CAIRO_CFLAGS) $(DRM_CFLAGS) $(DRM_NOUVEAU_CFLAGS) $(DRM_VC4_CFLAGS) \ + $(GLIB_CFLAGS) $(KMOD_CFLAGS) $(LIBUDEV_CFLAGS) $(LIBUNWIND_CFLAGS) \ -DIGT_SRCDIR=\""$(abs_srcdir)"\" \ - -DIGT_DATADIR=\""$(pkgdatadir)"\" \ - $(LIBUNWIND_CFLAGS) $(WERROR_CFLAGS) \ + -DIGT_DATADIR=\""$(pkgdatadir)"\" +AM_CFLAGS = $(CWARNFLAGS) -Wno-unused-result $(DEBUG_CFLAGS)\ + $(WERROR_CFLAGS) \ $(NULL) LDADD = ../lib/libintel_tools.la $(GLIB_LIBS) - -AM_CFLAGS += $(CAIRO_CFLAGS) $(LIBUDEV_CFLAGS) $(GLIB_CFLAGS) AM_LDFLAGS = -Wl,--as-needed drm_import_export_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS) @@ -104,19 +103,12 @@ gem_wait_LDADD = $(LDADD) -lrt kms_flip_LDADD = $(LDADD) -lrt -lpthread pm_rc6_residency_LDADD = $(LDADD) -lrt -prime_nv_test_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS) prime_nv_test_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS) -prime_nv_api_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS) prime_nv_api_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS) -prime_nv_pcopy_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS) prime_nv_pcopy_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS) -vc4_create_bo_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS) vc4_create_bo_LDADD = $(LDADD) $(DRM_VC4_LIBS) -vc4_lookup_fail_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS) vc4_lookup_fail_LDADD = $(LDADD) $(DRM_VC4_LIBS) -vc4_wait_bo_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS) vc4_wait_bo_LDADD = $(LDADD) $(DRM_VC4_LIBS) -vc4_wait_seqno_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS) vc4_wait_seqno_LDADD = $(LDADD) $(DRM_VC4_LIBS) endif
