mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-19 03:53:22 -04:00
media-libs/libjxl: remove package, moved to ::gentoo
Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Daniel Novomesky <dnovomesky@gmail.com>
This commit is contained in:
@@ -1 +0,0 @@
|
||||
DIST libjxl-0.6.1.tar.gz 16953185 BLAKE2B d1e906480e80458635a65bd89ce79f13d463e8cf4fb0dfccf6c473e7649fdc5593669effdf85afbb176920c89e61c65c4907834225f7c9e6da4c611996b201e3 SHA512 302935d722160b0b288ac63301f9e95caf82eccf6ad76c4f4da6316a0314ee3562115932b1ceacb0d02708de0a07788992d3478cae73af0b90193f5769f9fb52
|
||||
@@ -1,125 +0,0 @@
|
||||
--- a/lib/jxl.cmake
|
||||
+++ b/lib/jxl.cmake
|
||||
@@ -387,17 +387,6 @@
|
||||
target_link_libraries(jxl_enc-obj PUBLIC jxl_profiler)
|
||||
endif()
|
||||
|
||||
-#TODO(lode): don't depend on CMS for the core library
|
||||
-if (JPEGXL_ENABLE_SKCMS)
|
||||
- target_include_directories(jxl_enc-obj PRIVATE
|
||||
- $<TARGET_PROPERTY:skcms,INCLUDE_DIRECTORIES>
|
||||
- )
|
||||
-else ()
|
||||
- target_include_directories(jxl_enc-obj PRIVATE
|
||||
- $<TARGET_PROPERTY:lcms2,INCLUDE_DIRECTORIES>
|
||||
- )
|
||||
-endif ()
|
||||
-
|
||||
# Headers for exporting/importing public headers
|
||||
include(GenerateExportHeader)
|
||||
set_target_properties(jxl_dec-obj PROPERTIES
|
||||
--- a/lib/jxl_extras.cmake
|
||||
+++ b/lib/jxl_extras.cmake
|
||||
@@ -92,7 +92,7 @@
|
||||
endif ()
|
||||
|
||||
if (JPEGXL_ENABLE_OPENEXR)
|
||||
-pkg_check_modules(OpenEXR IMPORTED_TARGET OpenEXR)
|
||||
+pkg_check_modules(OpenEXR IMPORTED_TARGET OpenEXR-3)
|
||||
if (OpenEXR_FOUND)
|
||||
target_sources(jxl_extras-static PRIVATE
|
||||
extras/codec_exr.cc
|
||||
@@ -114,3 +114,4 @@
|
||||
endif()
|
||||
endif() # OpenEXR_FOUND
|
||||
endif() # JPEGXL_ENABLE_OPENEXR
|
||||
+
|
||||
--- a/plugins/gdk-pixbuf/CMakeLists.txt
|
||||
+++ b/plugins/gdk-pixbuf/CMakeLists.txt
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
# Note: This only needs the decoder library, but we don't install the decoder
|
||||
# shared library.
|
||||
-target_link_libraries(pixbufloader-jxl jxl jxl_threads skcms-interface PkgConfig::Gdk-Pixbuf)
|
||||
+target_link_libraries(pixbufloader-jxl jxl jxl_threads skcms PkgConfig::Gdk-Pixbuf)
|
||||
|
||||
pkg_get_variable(GDK_PIXBUF_MODULEDIR gdk-pixbuf-2.0 gdk_pixbuf_moduledir)
|
||||
install(TARGETS pixbufloader-jxl LIBRARY DESTINATION "${GDK_PIXBUF_MODULEDIR}")
|
||||
--- a/third_party/CMakeLists.txt
|
||||
+++ b/third_party/CMakeLists.txt
|
||||
@@ -113,15 +113,6 @@
|
||||
endif() # JPEGXL_DEP_LICENSE_DIR
|
||||
endif()
|
||||
|
||||
-# lodepng
|
||||
-if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lodepng/lodepng.h" )
|
||||
- message(FATAL_ERROR "Please run ${PROJECT_SOURCE_DIR}/deps.sh to fetch the "
|
||||
- "build dependencies.")
|
||||
-endif()
|
||||
-include(lodepng.cmake)
|
||||
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/lodepng/LICENSE"
|
||||
- ${PROJECT_BINARY_DIR}/LICENSE.lodepng COPYONLY)
|
||||
-
|
||||
# brotli
|
||||
if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/brotli/c/include/brotli/decode.h" OR
|
||||
JPEGXL_FORCE_SYSTEM_BROTLI)
|
||||
@@ -190,34 +181,3 @@
|
||||
endforeach()
|
||||
endif() # BROTLI_EMSCRIPTEN
|
||||
endif()
|
||||
-
|
||||
-# *cms
|
||||
-if (JPEGXL_ENABLE_SKCMS OR JPEGXL_ENABLE_PLUGINS)
|
||||
- if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/skcms/skcms.h" )
|
||||
- message(FATAL_ERROR "Please run ${PROJECT_SOURCE_DIR}/deps.sh to fetch the "
|
||||
- "build dependencies.")
|
||||
- endif()
|
||||
- include(skcms.cmake)
|
||||
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/skcms/LICENSE"
|
||||
- ${PROJECT_BINARY_DIR}/LICENSE.skcms COPYONLY)
|
||||
-endif ()
|
||||
-if (JPEGXL_ENABLE_VIEWERS OR NOT JPEGXL_ENABLE_SKCMS)
|
||||
- if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lcms/.git" )
|
||||
- message(SEND_ERROR "Please run git submodule update --init")
|
||||
- endif()
|
||||
- include(lcms2.cmake)
|
||||
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/lcms/COPYING"
|
||||
- ${PROJECT_BINARY_DIR}/LICENSE.lcms COPYONLY)
|
||||
-endif()
|
||||
-
|
||||
-# sjpeg
|
||||
-if (JPEGXL_ENABLE_SJPEG)
|
||||
- if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/sjpeg/CMakeLists.txt")
|
||||
- message(FATAL_ERROR "Please run ${PROJECT_SOURCE_DIR}/deps.sh to fetch the "
|
||||
- "build dependencies.")
|
||||
- endif()
|
||||
- include(sjpeg.cmake)
|
||||
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sjpeg/COPYING"
|
||||
- ${PROJECT_BINARY_DIR}/LICENSE.sjpeg COPYONLY)
|
||||
-endif ()
|
||||
-
|
||||
--- a/tools/comparison_viewer/CMakeLists.txt
|
||||
+++ b/tools/comparison_viewer/CMakeLists.txt
|
||||
@@ -24,9 +24,6 @@
|
||||
image_loading.cc
|
||||
image_loading.h
|
||||
)
|
||||
-target_include_directories(image_loading PRIVATE
|
||||
- $<TARGET_PROPERTY:lcms2,INCLUDE_DIRECTORIES>
|
||||
-)
|
||||
target_link_libraries(image_loading PUBLIC
|
||||
Qt5::Widgets
|
||||
jxl-static
|
||||
--- a/tools/viewer/CMakeLists.txt
|
||||
+++ b/tools/viewer/CMakeLists.txt
|
||||
@@ -26,10 +26,6 @@
|
||||
viewer_window.h
|
||||
viewer_window.ui
|
||||
)
|
||||
-target_include_directories(viewer PRIVATE
|
||||
- $<TARGET_PROPERTY:lcms2,INCLUDE_DIRECTORIES>
|
||||
- "${PROJECT_SOURCE_DIR}"
|
||||
-)
|
||||
target_link_libraries(viewer
|
||||
Qt5::Widgets
|
||||
icc_detect
|
||||
@@ -1,159 +0,0 @@
|
||||
# Copyright 2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit xdg cmake java-pkg-opt-2
|
||||
|
||||
DESCRIPTION="JPEG XL image format reference implementation"
|
||||
HOMEPAGE="https://github.com/libjxl/libjxl"
|
||||
SRC_URI="https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
KEYWORDS="~amd64"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="abi_x86_64 cpu_flags_arm_neon benchmark devtools examples java man +openexr plugins profile +sjpeg +skcms tcmalloc tools viewers" #emscripten fuzzers
|
||||
|
||||
CDEPEND="
|
||||
app-arch/brotli
|
||||
dev-cpp/highway:=
|
||||
media-libs/libpng
|
||||
media-libs/lodepng:=
|
||||
media-libs/giflib
|
||||
sys-libs/zlib
|
||||
|
||||
benchmark? (
|
||||
media-libs/libavif
|
||||
media-libs/libwebp
|
||||
virtual/jpeg
|
||||
)
|
||||
openexr? ( media-libs/openexr:= )
|
||||
plugins? (
|
||||
dev-libs/glib:2
|
||||
media-gfx/gimp
|
||||
media-libs/babl
|
||||
media-libs/gegl
|
||||
media-libs/skcms:=
|
||||
x11-libs/gdk-pixbuf
|
||||
x11-misc/shared-mime-info
|
||||
)
|
||||
sjpeg? ( media-libs/sjpeg:= )
|
||||
!skcms? ( media-libs/lcms )
|
||||
skcms? ( media-libs/skcms:= )
|
||||
tcmalloc? ( dev-util/google-perftools )
|
||||
viewers? (
|
||||
dev-qt/qtconcurrent
|
||||
dev-qt/qtwidgets
|
||||
dev-qt/qtx11extras
|
||||
media-libs/lcms
|
||||
x11-libs/libxcb
|
||||
)
|
||||
"
|
||||
RDEPEND="
|
||||
${CDEPEND}
|
||||
java? ( virtual/jre:1.8 )
|
||||
"
|
||||
DEPEND="
|
||||
${CDEPEND}
|
||||
dev-cpp/gtest
|
||||
kde-frameworks/extra-cmake-modules
|
||||
java? ( virtual/jdk:1.8 )
|
||||
plugins? ( x11-misc/xdg-utils )
|
||||
"
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
man? ( app-text/asciidoc )
|
||||
"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${PN}-0.6-system-libs.patch" )
|
||||
REQUIRED_USE="tcmalloc? ( abi_x86_64 )"
|
||||
DOCS=( AUTHORS README.md SECURITY.md PATENTS CONTRIBUTORS CHANGELOG.md )
|
||||
|
||||
CMAKE_IN_SOURCE_BUILD=1
|
||||
|
||||
src_prepare() {
|
||||
# remove bundled libs cmake
|
||||
rm third_party/*.cmake || die
|
||||
cmake_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DJPEGXL_ENABLE_BENCHMARK=$(usex benchmark)
|
||||
-DJPEGXL_ENABLE_DEVTOOLS=$(usex devtools)
|
||||
-DJPEGXL_ENABLE_EXAMPLES=$(usex examples)
|
||||
-DJPEGXL_ENABLE_JNI=$(usex java)
|
||||
-DJPEGXL_ENABLE_MANPAGES=$(usex man)
|
||||
-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
|
||||
-DJPEGXL_ENABLE_PLUGINS=$(usex plugins)
|
||||
-DJPEGXL_ENABLE_PROFILER=$(usex profile)
|
||||
-DJPEGXL_ENABLE_SJPEG=$(usex sjpeg)
|
||||
-DJPEGXL_ENABLE_SKCMS=$(usex skcms)
|
||||
-DJPEGXL_ENABLE_TCMALLOC=$(usex tcmalloc)
|
||||
-DJPEGXL_ENABLE_TOOLS=$(usex tools)
|
||||
-DJPEGXL_ENABLE_VIEWERS=$(usex viewers)
|
||||
-DJPEGXL_FORCE_NEON=$(usex cpu_flags_arm_neon)
|
||||
|
||||
-DBUILD_SHARED_LIBS=ON
|
||||
-DCMAKE_SKIP_RPATH=ON
|
||||
-DBUILD_TESTING=OFF
|
||||
-DJPEGXL_BUNDLE_SKCMS=OFF
|
||||
-DJPEGXL_ENABLE_COVERAGE=OFF
|
||||
-DJPEGXL_ENABLE_FUZZERS=OFF
|
||||
-DJPEGXL_ENABLE_TRANSCODE_JPEG=ON
|
||||
-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
|
||||
-DJPEGXL_FORCE_SYSTEM_GTEST=ON
|
||||
-DJPEGXL_FORCE_SYSTEM_HWY=ON
|
||||
-DJPEGXL_STATIC=OFF
|
||||
-DJPEGXL_WARNINGS_AS_ERRORS=OFF
|
||||
)
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
dolib.so libjxl_dec.so*
|
||||
einstalldocs
|
||||
#TODO: install documentation
|
||||
exeinto "/usr/libexec/${PN}"
|
||||
if use examples; then
|
||||
doexe {en,de}code_oneshot
|
||||
dobin jxlinfo
|
||||
fi
|
||||
pushd "${BUILD_DIR}/tools" || die
|
||||
insinto "/usr/share/${PN}"
|
||||
doins progressive_saliency.conf example_tree.txt
|
||||
if use java; then
|
||||
dolib.so libjxl_jni.so
|
||||
rm libjxl_jni.so || die
|
||||
doins *.jar
|
||||
fi
|
||||
if use benchmark; then
|
||||
docinto "/usr/share/doc/${PF}/benchmark/hm"
|
||||
dodoc benchmark/hm/README.md
|
||||
else
|
||||
rm -r benchmark || die
|
||||
fi
|
||||
# remove non executable or non .m files
|
||||
find . -type f \! -name '*.m' \! -executable -delete || die
|
||||
# delete empty dirs
|
||||
find . -type d -empty -print -delete || die
|
||||
mkdir -p "${ED}/usr/libexec/${PN}/tools/" || die
|
||||
# install tools
|
||||
cp -r . "${ED}/usr/libexec/${PN}/tools/" || die
|
||||
|
||||
# keep in /usr/bin only the executables with jxl in the name
|
||||
rm -f "${ED}"/usr/libexec/${PN}/tools/*jxl* || die
|
||||
rm -f "${ED}"/usr/bin/{fuzzer_corpus,*_main,decode_and_encode,*_hlg,tone_map,xyb_range} || die
|
||||
|
||||
find "${D}" -name '*.a' -delete || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_mimeinfo_database_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_mimeinfo_database_update
|
||||
}
|
||||
@@ -1,82 +0,0 @@
|
||||
# Copyright 2021-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
CMAKE_ECLASS=cmake
|
||||
inherit cmake-multilib git-r3 xdg
|
||||
|
||||
DESCRIPTION="JPEG XL image format reference implementation"
|
||||
HOMEPAGE="https://github.com/libjxl/libjxl"
|
||||
|
||||
EGIT_REPO_URI="https://github.com/libjxl/libjxl.git"
|
||||
EGIT_SUBMODULES=(third_party/skcms)
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE="examples gdk-pixbuf gimp210 openexr"
|
||||
|
||||
DEPEND="app-arch/brotli[${MULTILIB_USEDEP}]
|
||||
dev-cpp/gflags[${MULTILIB_USEDEP}]
|
||||
>=dev-cpp/highway-0.16.0[${MULTILIB_USEDEP}]
|
||||
media-libs/giflib[${MULTILIB_USEDEP}]
|
||||
media-libs/libpng[${MULTILIB_USEDEP}]
|
||||
openexr? ( media-libs/openexr:= )
|
||||
sys-libs/zlib[${MULTILIB_USEDEP}]
|
||||
virtual/jpeg[${MULTILIB_USEDEP}]
|
||||
x11-misc/shared-mime-info
|
||||
gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
|
||||
gimp210? ( >=media-gfx/gimp-2.10.28:0/2 )
|
||||
"
|
||||
|
||||
BDEPEND=""
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
multilib_src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DCMAKE_SKIP_RPATH=ON
|
||||
-DBUILD_TESTING=OFF
|
||||
-DJPEGXL_ENABLE_BENCHMARK=OFF
|
||||
-DJPEGXL_ENABLE_COVERAGE=OFF
|
||||
-DJPEGXL_ENABLE_FUZZERS=OFF
|
||||
-DJPEGXL_ENABLE_SJPEG=OFF
|
||||
-DJPEGXL_WARNINGS_AS_ERRORS=OFF
|
||||
|
||||
-DJPEGXL_ENABLE_SKCMS=ON
|
||||
-DJPEGXL_ENABLE_VIEWERS=OFF
|
||||
-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
|
||||
-DJPEGXL_FORCE_SYSTEM_HWY=ON
|
||||
-DJPEGXL_ENABLE_DOXYGEN=OFF
|
||||
-DJPEGXL_ENABLE_MANPAGES=OFF
|
||||
-DJPEGXL_ENABLE_JNI=OFF
|
||||
-DJPEGXL_ENABLE_TCMALLOC=OFF
|
||||
)
|
||||
|
||||
if multilib_is_native_abi; then
|
||||
mycmakeargs+=(
|
||||
-DJPEGXL_ENABLE_TOOLS=ON
|
||||
-DJPEGXL_ENABLE_EXAMPLES=$(usex examples)
|
||||
-DJPEGXL_ENABLE_OPENEXR=$(usex openexr)
|
||||
-DJPEGXL_ENABLE_PLUGINS=ON
|
||||
-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=$(usex gdk-pixbuf)
|
||||
-DJPEGXL_ENABLE_PLUGIN_GIMP210=$(usex gimp210)
|
||||
)
|
||||
else
|
||||
mycmakeargs+=(
|
||||
-DJPEGXL_ENABLE_TOOLS=OFF
|
||||
-DJPEGXL_ENABLE_EXAMPLES=OFF
|
||||
-DJPEGXL_ENABLE_OPENEXR=OFF
|
||||
-DJPEGXL_ENABLE_PLUGINS=OFF
|
||||
)
|
||||
fi
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
cmake_src_install
|
||||
if use examples && multilib_is_native_abi; then
|
||||
dobin "${BUILD_DIR}/jxlinfo"
|
||||
fi
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>dnovomesky@gmail.com</email>
|
||||
<name>Daniel Novomesky</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="benchmark">Build JPEGXL benchmark tools</flag>
|
||||
<flag name="devtools">Build JPEGXL developer tools</flag>
|
||||
<!--<flag name="fuzzers">Build the fuzzers</flag>-->
|
||||
<flag name="gdk-pixbuf">Build a gdk-pixbuf loader</flag>
|
||||
<flag name="gimp210">Enable plugin for GIMP 2.10.x series</flag>
|
||||
<flag name="openexr">Build JPEGXL with support for OpenEXR</flag>
|
||||
<flag name="plugins">Build third-party plugins to support JPEG XL in other applications</flag>
|
||||
<flag name="sjpeg">Build JPEGXL with support for encoding with sjpeg</flag>
|
||||
<flag name="skcms">Build with skcms instead of lcms2</flag>
|
||||
<flag name="tcmalloc">Build JPEGXL using gperftools (tcmalloc) allocator</flag>
|
||||
<flag name="tools">Build JPEGXL user tools: cjxl and djxl</flag>
|
||||
<flag name="viewers">Build JPEGXL viewer tools for evaluation</flag>
|
||||
</use>
|
||||
</pkgmetadata>
|
||||
Reference in New Issue
Block a user