mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
app-arch/stormlib: Remove old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
@@ -1,2 +1 @@
|
||||
DIST StormLib-9.26.tar.gz 610223 BLAKE2B 670296e5d1f9d2b22d5f6cad214ff7076fdc5078c7aa6d13458e06b4b44b62acf2bd68689a05c630db024ea3d54bbc5be14855d757a1b31475664a593fb5db60 SHA512 5f0ce75019cfbe3a2dfc07ea312825e2babf226dbf8aa77ed60456862ae739ac4689cbe7d4a185cdc148ad9910fd8137d3f11c04ffe6c532bbdacb08838ecfba
|
||||
DIST StormLib-9.30.tar.gz 617848 BLAKE2B 214289082ad65007d8222663d64a65d55eac32d9aa56d3cd341bbfd16a8e2df748b8dd1d0244e3f12750bd6793ad014031ff91bb630f7445d1d2ebee26769249 SHA512 11da94507661c949fd402d06d303323af9964bfa1121226a3fde8858f18aa827b13375ab08e4751f7b4baef01464417898bcd3f29da1aa94083710dcafa1d1f9
|
||||
|
||||
@@ -1,58 +0,0 @@
|
||||
From 2e1e371c0a9eeaa015615b5a9f6826ec071a2e4a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
||||
Date: Mon, 10 Jun 2024 14:41:37 +0200
|
||||
Subject: [PATCH] cmake: Use GNUInstallDirs for configurable install
|
||||
directories
|
||||
|
||||
Use the standard GNUInstallDirs CMake module to provide configurable
|
||||
install directories rather than hardcoding `bin`, `lib`, etc. Most
|
||||
importantly, this fixes install on modern 64-bit systems that use
|
||||
`lib64` rather than `lib`.
|
||||
---
|
||||
CMakeLists.txt | 15 ++++++++-------
|
||||
1 file changed, 8 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4758091..6546b69 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -7,6 +7,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
include(CMakeDependentOption)
|
||||
+include(GNUInstallDirs)
|
||||
|
||||
option(BUILD_SHARED_LIBS "Compile shared libraries" OFF)
|
||||
option(STORM_SKIP_INSTALL "Skip installing files" OFF)
|
||||
@@ -360,14 +361,14 @@ endif()
|
||||
if (NOT STORM_SKIP_INSTALL)
|
||||
install(TARGETS ${LIBRARY_NAME}
|
||||
EXPORT ${PROJECT_NAME}Config
|
||||
- RUNTIME DESTINATION bin
|
||||
- LIBRARY DESTINATION lib
|
||||
- ARCHIVE DESTINATION lib
|
||||
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
FRAMEWORK DESTINATION /Library/Frameworks
|
||||
- PUBLIC_HEADER DESTINATION include
|
||||
- INCLUDES DESTINATION include)
|
||||
+ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
||||
+ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
||||
|
||||
- install(EXPORT ${PROJECT_NAME}Config NAMESPACE ${PROJECT_NAME}:: DESTINATION share/${PROJECT_NAME})
|
||||
+ install(EXPORT ${PROJECT_NAME}Config NAMESPACE ${PROJECT_NAME}:: DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME})
|
||||
|
||||
#CPack configurtion
|
||||
SET(CPACK_GENERATOR "DEB" "RPM")
|
||||
@@ -401,6 +402,6 @@ if(STORM_BUILD_TESTS)
|
||||
find_package(ALSA REQUIRED)
|
||||
add_executable(StormLib_test ${TEST_SRC_FILES})
|
||||
target_link_libraries(StormLib_test ${LIBRARY_NAME} ${ALSA_LIBRARIES})
|
||||
- install(TARGETS StormLib_test RUNTIME DESTINATION bin)
|
||||
+ install(TARGETS StormLib_test RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
endif()
|
||||
|
||||
--
|
||||
2.45.2
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
# Copyright 2020-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit cmake
|
||||
|
||||
MY_P=StormLib-${PV}
|
||||
DESCRIPTION="Library to read and write MPQ archives (Diablo, StarCraft)"
|
||||
HOMEPAGE="
|
||||
http://www.zezula.net/en/mpq/stormlib.html
|
||||
https://github.com/ladislav-zezula/StormLib/
|
||||
"
|
||||
SRC_URI="
|
||||
https://github.com/ladislav-zezula/StormLib/archive/v${PV}.tar.gz
|
||||
-> ${MY_P}.tar.gz
|
||||
"
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
RDEPEND="
|
||||
app-arch/bzip2:=
|
||||
dev-libs/libtomcrypt:=[libtommath]
|
||||
virtual/zlib:=
|
||||
"
|
||||
DEPEND=${RDEPEND}
|
||||
|
||||
PATCHES=(
|
||||
# https://github.com/ladislav-zezula/StormLib/pull/352
|
||||
"${FILESDIR}/${P}-gnuinstalldirs.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DBUILD_SHARED_LIBS=ON
|
||||
# interactive test app
|
||||
-DSTORM_BUILD_TESTS=OFF
|
||||
-DWITH_LIBTOMCRYPT=ON
|
||||
)
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
Reference in New Issue
Block a user