Thanks, applied as 15a49614268a10c0d5a970a76a403ef9366ee57e.
Michael
[sent from post-receive hook]
On Fri, 30 Oct 2020 13:02:22 +0100, Michael Tretter <m.tret...@pengutronix.de>
wrote:
> Signed-off-by: Michael Tretter <m.tret...@pengutronix.de>
> Message-Id: <20201016124040.3353782-1-m.tret...@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de>
>
> diff --git
> a/patches/apitrace-9.0/0001-Use-CMAKE_INSTALL_LIBDIR-for-LIB_INSTALL_DIR.patch
>
> b/patches/apitrace-9.0/0001-Use-CMAKE_INSTALL_LIBDIR-for-LIB_INSTALL_DIR.patch
> new file mode 100644
> index 000000000000..f2bf4d46b62f
> --- /dev/null
> +++
> b/patches/apitrace-9.0/0001-Use-CMAKE_INSTALL_LIBDIR-for-LIB_INSTALL_DIR.patch
> @@ -0,0 +1,49 @@
> +From: Mike Frysinger <vap...@gentoo.org>
> +Date: Mon, 29 Apr 2019 20:32:04 +0200
> +Subject: [PATCH] Use CMAKE_INSTALL_LIBDIR for LIB_INSTALL_DIR
> +
> +Respect the libdir cmake already set up for us instead of using
> +debian-specific multiarch paths.
> +
> +Patch was rebased multiple times from 4.0 to 9.0 now.
> +
> +Signed-off-by: Andreas Sturmlechner <ast...@gentoo.org>
> +---
> + CMakeLists.txt | 17 ++---------------
> + 1 file changed, 2 insertions(+), 15 deletions(-)
> +
> +diff --git a/CMakeLists.txt b/CMakeLists.txt
> +index 19316e604286..6c3c4b85c19c 100644
> +--- a/CMakeLists.txt
> ++++ b/CMakeLists.txt
> +@@ -438,15 +438,6 @@ endif ()
> +
> ##############################################################################
> + # Installation directories
> +
> +-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
> +- # Debian multiarch support
> +- execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
> +- OUTPUT_VARIABLE ARCH_SUBDIR
> +- ERROR_QUIET
> +- OUTPUT_STRIP_TRAILING_WHITESPACE
> +- )
> +-endif()
> +-
> + if (WIN32 OR APPLE)
> + # On Windows/MacOSX, applications are usually installed on a directory
> of
> + # their own
> +@@ -455,12 +446,8 @@ if (WIN32 OR APPLE)
> + set (LIB_ARCH_INSTALL_DIR lib)
> + else ()
> + set (DOC_DEFAULT_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
> +- set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
> +- if (ARCH_SUBDIR)
> +- set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
> +- else ()
> +- set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
> +- endif ()
> ++ set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME})
> ++ set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
> + endif ()
> +
> + # Allow customization of the doc installation dir (Slackware uses different
> diff --git a/patches/apitrace-9.0/series b/patches/apitrace-9.0/series
> new file mode 100644
> index 000000000000..c75669299f04
> --- /dev/null
> +++ b/patches/apitrace-9.0/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-Use-CMAKE_INSTALL_LIBDIR-for-LIB_INSTALL_DIR.patch
> +# e6b6e6297e24d182be6d8261d1509250 - git-ptx-patches magic
> diff --git a/rules/apitrace.in b/rules/apitrace.in
> new file mode 100644
> index 000000000000..2bac254d002c
> --- /dev/null
> +++ b/rules/apitrace.in
> @@ -0,0 +1,11 @@
> +## SECTION=debug_tools
> +
> +config APITRACE
> + tristate
> + select HOST_CMAKE
> + select HOST_SYSTEM_PYTHON3
> + select ZLIB
> + select LIBPNG
> + prompt "apitrace"
> + help
> + Tools for tracing OpenGL, Direct3D, and other graphics APIs.
> diff --git a/rules/apitrace.make b/rules/apitrace.make
> new file mode 100644
> index 000000000000..d98771d4b8f3
> --- /dev/null
> +++ b/rules/apitrace.make
> @@ -0,0 +1,72 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2020 by Michael Tretter <m.tret...@pengutronix.de>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_APITRACE) += apitrace
> +
> +#
> +# Paths and names
> +#
> +APITRACE_VERSION := 9.0
> +APITRACE_MD5 := 83bacfb35f4f339571702099d283f571
> +APITRACE := apitrace-$(APITRACE_VERSION)
> +APITRACE_SUFFIX := tar.gz
> +APITRACE_URL :=
> https://github.com/apitrace/apitrace/archive/$(APITRACE_VERSION).$(APITRACE_SUFFIX)
> +APITRACE_SOURCE := $(SRCDIR)/$(APITRACE).$(APITRACE_SUFFIX)
> +APITRACE_DIR := $(BUILDDIR)/$(APITRACE)
> +APITRACE_LICENSE := MIT AND BSD-3-CLAUSE
> +APITRACE_LICENSE_FILES :=
> file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50 \
> +
> file://thirdparty/snappy/COPYING;md5=f62f3080324a97b3159a7a7e61812d0c
> +
> +#
> ----------------------------------------------------------------------------
> +# Prepare
> +#
> ----------------------------------------------------------------------------
> +
> +APITRACE_CONF_TOOL := cmake
> +APITRACE_CONF_OPT := \
> + $(CROSS_CMAKE_USR) \
> + -DCMAKE_BUILD_TYPE=Release \
> + -DCMAKE_INSTALL_LIBDIR=/usr/lib \
> + -DENABLE_ASAN=OFF \
> + -DENABLE_CLI=ON \
> + -DENABLE_EGL=ON \
> + -DENABLE_FRAME_POINTER=ON \
> + -DENABLE_GUI=OFF \
> + -DENABLE_SSE42=OFF \
> + -DENABLE_STATIC_EXE=OFF \
> + -DENABLE_STATIC_LIBGCC=OFF \
> + -DENABLE_STATIC_LIBSTDCXX=OFF \
> + -DENABLE_STATIC_SNAPPY=SNAPPY \
> + -DENABLE_TESTS=OFF \
> + -DENABLE_WAFFLE=OFF \
> + -DENABLE_X11=OFF
> +
> +#
> ----------------------------------------------------------------------------
> +# Target-Install
> +#
> ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/apitrace.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, apitrace)
> + @$(call install_fixup, apitrace,PRIORITY,optional)
> + @$(call install_fixup, apitrace,SECTION,base)
> + @$(call install_fixup, apitrace,AUTHOR,"Michael Tretter
> <m.tret...@pengutronix.de>")
> + @$(call install_fixup, apitrace,DESCRIPTION,missing)
> +
> + @$(call install_copy, apitrace, 0, 0, 0755, -, /usr/bin/apitrace)
> +
> + @$(call install_lib, apitrace, 0, 0, 0644, apitrace/wrappers/egltrace)
> +
> + @$(call install_finish, apitrace)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
