From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 63F99138334 for ; Fri, 24 May 2019 14:20:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7780EE08CD; Fri, 24 May 2019 14:20:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 47E3EE08CD for ; Fri, 24 May 2019 14:20:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D77B5344F53 for ; Fri, 24 May 2019 14:20:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 591BF5E7 for ; Fri, 24 May 2019 14:20:52 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1558707626.09d3a7a7d6c604d5a14f8cf98482c18228618e09.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/beignet/, dev-libs/beignet/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/beignet/beignet-9999.ebuild dev-libs/beignet/files/beignet-1.4.0-oclicd_no_upstream_icdfile.patch dev-libs/beignet/files/beignet-1.4.0_no-debian-multiarch.patch X-VCS-Directories: dev-libs/beignet/ dev-libs/beignet/files/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 09d3a7a7d6c604d5a14f8cf98482c18228618e09 X-VCS-Branch: master Date: Fri, 24 May 2019 14:20:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1abb9428-6c28-4e5a-b952-bc6f438098d6 X-Archives-Hash: 75d3fcca39a89e6f8edd306c38744c8a commit: 09d3a7a7d6c604d5a14f8cf98482c18228618e09 Author: Marek Szuba gentoo org> AuthorDate: Fri May 24 11:16:31 2019 +0000 Commit: Marek Szuba gentoo org> CommitDate: Fri May 24 14:20:26 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09d3a7a7 dev-libs/beignet: remove live ebuild There haven't been any commits to the Beignet Git repository since July 2018, and what is there right now causes LuxMark to segfault almost immediately. Signed-off-by: Marek Szuba gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 dev-libs/beignet/beignet-9999.ebuild | 102 --------------------- .../beignet-1.4.0-oclicd_no_upstream_icdfile.patch | 17 ---- .../files/beignet-1.4.0_no-debian-multiarch.patch | 21 ----- 3 files changed, 140 deletions(-) diff --git a/dev-libs/beignet/beignet-9999.ebuild b/dev-libs/beignet/beignet-9999.ebuild deleted file mode 100644 index 735edfd2e51..00000000000 --- a/dev-libs/beignet/beignet-9999.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) -CMAKE_BUILD_TYPE="Release" - -inherit python-any-r1 cmake-multilib flag-o-matic toolchain-funcs - -DESCRIPTION="OpenCL implementation for Intel GPUs" -HOMEPAGE="https://01.org/beignet https://gitlab.freedesktop.org/beignet/beignet" - -LICENSE="LGPL-2.1+" -SLOT="0" -IUSE="ocl-icd ocl20" - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.freedesktop.org/beignet/beignet.git" - KEYWORDS="" -else - KEYWORDS="~amd64" - SRC_URI="https://01.org/sites/default/files/${P}-source.tar.gz" - S=${WORKDIR}/Beignet-${PV}-Source -fi - -COMMON="media-libs/mesa - sys-devel/clang:= - sys-devel/llvm:= - >=x11-libs/libdrm-2.4.70[video_cards_intel] - x11-libs/libXext - x11-libs/libXfixes" -RDEPEND="${COMMON} - app-eselect/eselect-opencl" -DEPEND="${COMMON} - ${PYTHON_DEPS} - ocl-icd? ( dev-libs/ocl-icd ) - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-1.4.0_no-debian-multiarch.patch - "${FILESDIR}"/${PN}-1.4.0-oclicd_no_upstream_icdfile.patch - "${FILESDIR}"/${PN}-1.2.0_no-hardcoded-cflags.patch - "${FILESDIR}"/llvm-terminfo.patch -) - -DOCS=( - docs/. -) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != "binary" ]]; then - if tc-is-gcc; then - if [[ $(gcc-major-version) -eq 4 ]] && [[ $(gcc-minor-version) -lt 6 ]]; then - eerror "Compilation with gcc older than 4.6 is not supported" - die "Too old gcc found." - fi - fi - fi -} - -pkg_setup() { - python_setup -} - -src_prepare() { - # See Bug #593968 - append-flags -fPIC - - cmake-utils_src_prepare - # We cannot run tests because they require permissions to access - # the hardware, and building them is very time-consuming. - cmake_comment_add_subdirectory utests -} - -multilib_src_configure() { - VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}" - - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}" - -DOCLICD_COMPAT=$(usex ocl-icd) - $(usex ocl20 "" "-DENABLE_OPENCL_20=OFF") - ) - - cmake-utils_src_configure -} - -multilib_src_install() { - VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}" - - cmake-utils_src_install - - insinto /etc/OpenCL/vendors/ - echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file" - doins "${PN}-${ABI}.icd" - - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1 - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so.1 - dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libcl.so -} diff --git a/dev-libs/beignet/files/beignet-1.4.0-oclicd_no_upstream_icdfile.patch b/dev-libs/beignet/files/beignet-1.4.0-oclicd_no_upstream_icdfile.patch deleted file mode 100644 index ddffcfc8aff..00000000000 --- a/dev-libs/beignet/files/beignet-1.4.0-oclicd_no_upstream_icdfile.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -214,14 +214,6 @@ - Find_Package(OCLIcd) - IF(OCLIcd_FOUND) - MESSAGE(STATUS "Looking for OCL ICD header file - found") -- configure_file ( -- "intel-beignet.icd.in" -- "${ICD_FILE_NAME}" -- ) -- IF(NOT OCL_ICD_INSTALL_PREFIX) -- set(OCL_ICD_INSTALL_PREFIX "/etc/OpenCL/vendors") -- ENDIF(NOT OCL_ICD_INSTALL_PREFIX) -- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION ${OCL_ICD_INSTALL_PREFIX}) - ELSE(OCLIcd_FOUND) - MESSAGE(STATUS "Looking for OCL ICD header file - not found") - MESSAGE(FATAL_ERROR "OCL ICD loader miss. If you really want to disable OCL ICD support, please run cmake with option -DOCLICD_COMPAT=0.") diff --git a/dev-libs/beignet/files/beignet-1.4.0_no-debian-multiarch.patch b/dev-libs/beignet/files/beignet-1.4.0_no-debian-multiarch.patch deleted file mode 100644 index 983ba61ff38..00000000000 --- a/dev-libs/beignet/files/beignet-1.4.0_no-debian-multiarch.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -33,15 +33,9 @@ - - SET(CMAKE_VERBOSE_MAKEFILE "false") - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/") --INCLUDE (GNUInstallDirs OPTIONAL) --# support old CMake without GNUInstallDirs --if (NOT CMAKE_INSTALL_FULL_LIBDIR) -- set (CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib") -- set (CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_PREFIX}/share") -- set (BEIGNET_LIBRARY_ARCHITECTURE "") --else (NOT CMAKE_INSTALL_FULL_LIBDIR) -- set (BEIGNET_LIBRARY_ARCHITECTURE "${CMAKE_LIBRARY_ARCHITECTURE}") --endif (NOT CMAKE_INSTALL_FULL_LIBDIR) -+set (CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib") -+set (CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_PREFIX}/share") -+set (BEIGNET_LIBRARY_ARCHITECTURE "") - - if (NOT LIB_INSTALL_DIR) - set (LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")