pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
libjxl: remove, imported to pkgsrc/graphics/libjxl
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Tue Feb 4 12:24:05 2025 +0100
Changeset: e9c9bc4666424342ab0fc92e268e365d9bee08f7
Modified Files:
Makefile
gdk-pixbuf-jxl/Makefile
Removed Files:
libjxl/DESCR
libjxl/Makefile
libjxl/Makefile.common
libjxl/PLIST
libjxl/buildlink3.mk
libjxl/distinfo
libjxl/patches/patch-lib_jxl.cmake
libjxl/patches/patch-lib_jxl__threads.cmake
libjxl/patches/patch-plugins_gdk-pixbuf_CMakeLists.txt
Log Message:
libjxl: remove, imported to pkgsrc/graphics/libjxl
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e9c9bc4666424342ab0fc92e268e365d9bee08f7
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 2 +-
gdk-pixbuf-jxl/Makefile | 4 +--
libjxl/DESCR | 3 --
libjxl/Makefile | 39 --------------------
libjxl/Makefile.common | 14 --------
libjxl/PLIST | 42 ----------------------
libjxl/buildlink3.mk | 16 ---------
libjxl/distinfo | 8 -----
libjxl/patches/patch-lib_jxl.cmake | 29 ---------------
libjxl/patches/patch-lib_jxl__threads.cmake | 17 ---------
.../patch-plugins_gdk-pixbuf_CMakeLists.txt | 29 ---------------
11 files changed, 3 insertions(+), 200 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 60c990b24b..37fa317715 100644
--- a/Makefile
+++ b/Makefile
@@ -2069,7 +2069,6 @@ SUBDIR+= libircclient
SUBDIR+= libitl
SUBDIR+= libjdksmidi
SUBDIR+= libjingle
-SUBDIR+= libjxl
SUBDIR+= libkml
SUBDIR+= libks
SUBDIR+= liblingoteach
@@ -5205,6 +5204,7 @@ SUBDIR+= rust182-bin
SUBDIR+= rust183
SUBDIR+= rust183-bin
SUBDIR+= rust184
+SUBDIR+= rust184-bin
SUBDIR+= s-nail
SUBDIR+= s2tc
SUBDIR+= s3cmd
diff --git a/gdk-pixbuf-jxl/Makefile b/gdk-pixbuf-jxl/Makefile
index a3a08831f8..642cb9efd3 100644
--- a/gdk-pixbuf-jxl/Makefile
+++ b/gdk-pixbuf-jxl/Makefile
@@ -1,15 +1,15 @@
# $NetBSD$
-.include "../../wip/libjxl/Makefile.common"
+.include "../../graphics/libjxl/Makefile.common"
PKGNAME= ${DISTNAME:S/lib/gdk-pixbuf-/g}
COMMENT= JpegXL GDK pixbuf loader
WRKSRC= ${WRKDIR}/${DISTNAME}
+USE_CMAKE= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
-USE_CMAKE= yes
CONFIGURE_DIRS= plugins/gdk-pixbuf
BUILD_DIRS= plugins/gdk-pixbuf
diff --git a/libjxl/DESCR b/libjxl/DESCR
deleted file mode 100644
index 45fd816801..0000000000
--- a/libjxl/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Library for reading and writing JPEG XL images.
-JPEG XL (.jxl) is the next generation , general-purpose
-image compression codec by the JPEG committee.
diff --git a/libjxl/Makefile b/libjxl/Makefile
deleted file mode 100644
index 54fe1b6855..0000000000
--- a/libjxl/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# $NetBSD$
-
-.include "../../wip/libjxl/Makefile.common"
-COMMENT= JpegXL reference codec
-
-TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
-
-USE_TOOLS+= pkg-config
-USE_LANGUAGES= c c++
-
-CMAKE_CONFIGURE_ARGS+= -DJPEGXL_VERSION=${PKGVERSION_NOREV}
-CMAKE_CONFIGURE_ARGS+= -DJPEGXL_FORCE_SYSTEM_BROTLI=ON
-CMAKE_CONFIGURE_ARGS+= -DJPEGXL_FORCE_SYSTEM_HWY=ON
-CMAKE_CONFIGURE_ARGS+= -DJPEGXL_FORCE_SYSTEM_LCMS2=ON
-CMAKE_CONFIGURE_ARGS+= -DJPEGXL_ENABLE_DOXYGEN=OFF
-CMAKE_CONFIGURE_ARGS+= -DJPEGXL_ENABLE_JPEGLI=OFF
-CMAKE_CONFIGURE_ARGS+= -DJPEGXL_ENABLE_SJPEG=OFF
-CMAKE_CONFIGURE_ARGS+= -DJPEGXL_ENABLE_SKCMS=OFF
-CMAKE_CONFIGURE_ARGS+= -DJPEGXL_ENABLE_PLUGINS=OFF
-# test are run during the build stage
-CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING=OFF
-
-REPLACE_BASH= deps.sh
-
-PKGCONFIG_OVERRIDE+= lib/jxl/libjxl.pc.in
-PKGCONFIG_OVERRIDE+= lib/jxl/libjxl_cms.pc.in
-PKGCONFIG_OVERRIDE+= lib/threads/libjxl_threads.pc.in
-
-.include "../../devel/cmake/build.mk"
-.include "../../archivers/brotli/buildlink3.mk"
-.include "../../graphics/libavif/buildlink3.mk"
-.include "../../graphics/giflib/buildlink3.mk"
-.include "../../graphics/openexr/buildlink3.mk"
-.include "../../graphics/lcms2/buildlink3.mk"
-.include "../../graphics/libwebp/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/libhighway/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/libjxl/Makefile.common b/libjxl/Makefile.common
deleted file mode 100644
index 72e17ad927..0000000000
--- a/libjxl/Makefile.common
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD$
-# used by wip/gdk-pixbuf-jxl/Makefile
-
-DISTNAME= libjxl-0.11.1
-CATEGORIES= graphics
-MASTER_SITES= ${MASTER_SITE_GITHUB:=libjxl/}
-GITHUB_TAG= v${PKGVERSION_NOREV}
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://jpegxl.info/
-LICENSE= modified-bsd
-
-PATCHDIR?= ${.CURDIR}/../../wip/libjxl/patches
-DISTINFO_FILE?= ${.CURDIR}/../../wip/libjxl/distinfo
diff --git a/libjxl/PLIST b/libjxl/PLIST
deleted file mode 100644
index a943be509f..0000000000
--- a/libjxl/PLIST
+++ /dev/null
@@ -1,42 +0,0 @@
-@comment $NetBSD$
-bin/benchmark_xl
-bin/cjxl
-bin/djxl
-bin/jxlinfo
-include/jxl/cms.h
-include/jxl/cms_interface.h
-include/jxl/codestream_header.h
-include/jxl/color_encoding.h
-include/jxl/compressed_icc.h
-include/jxl/decode.h
-include/jxl/decode_cxx.h
-include/jxl/encode.h
-include/jxl/encode_cxx.h
-include/jxl/gain_map.h
-include/jxl/jxl_cms_export.h
-include/jxl/jxl_export.h
-include/jxl/jxl_threads_export.h
-include/jxl/memory_manager.h
-include/jxl/parallel_runner.h
-include/jxl/resizable_parallel_runner.h
-include/jxl/resizable_parallel_runner_cxx.h
-include/jxl/stats.h
-include/jxl/thread_parallel_runner.h
-include/jxl/thread_parallel_runner_cxx.h
-include/jxl/types.h
-include/jxl/version.h
-lib/libjxl.so
-lib/libjxl.so.0.11
-lib/libjxl.so.${PKGVERSION}
-lib/libjxl_cms.so
-lib/libjxl_cms.so.0.11
-lib/libjxl_cms.so.${PKGVERSION}
-lib/libjxl_extras_codec.a
-lib/libjxl_threads.so
-lib/libjxl_threads.so.0.11
-lib/libjxl_threads.so.${PKGVERSION}
-lib/pkgconfig/libjxl.pc
-lib/pkgconfig/libjxl_cms.pc
-lib/pkgconfig/libjxl_threads.pc
-man/man1/cjxl.1
-man/man1/djxl.1
diff --git a/libjxl/buildlink3.mk b/libjxl/buildlink3.mk
deleted file mode 100644
index 39a730221b..0000000000
--- a/libjxl/buildlink3.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD$
-
-BUILDLINK_TREE+= libjxl
-
-.if !defined(LIBJXL_BUILDLINK3_MK)
-LIBJXL_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.libjxl+= libjxl>=0.8.2
-BUILDLINK_PKGSRCDIR.libjxl?= ../../wip/libjxl
-
-.include "../../archivers/brotli/buildlink3.mk"
-.include "../../graphics/libhighway/buildlink3.mk"
-.include "../../graphics/lcms2/buildlink3.mk"
-.endif # LIBJXL_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -libjxl
diff --git a/libjxl/distinfo b/libjxl/distinfo
deleted file mode 100644
index a75052fb4d..0000000000
--- a/libjxl/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD$
-
-BLAKE2s (libjxl-0.11.1.tar.gz) = 0bdaeca1d628578a46553cf81843707011c8eed31a482a9646c6f3155a0bcf33
-SHA512 (libjxl-0.11.1.tar.gz) = 0cfd81d9d3b783f96bd04f244d73ffbc12186c89993d46064a2751bef0a446a5e86be05add5c10f60d4482d39333d9bf3f9a866d6eb84f8fa0d4e8b5828fd74c
-Size (libjxl-0.11.1.tar.gz) = 1876134 bytes
-SHA1 (patch-lib_jxl.cmake) = f4111e8818bbcbd9ef43b30643557fd6411afb9f
-SHA1 (patch-lib_jxl__threads.cmake) = d4f0bdcda4f1207797f28c2c671c679ee0eaa1d0
-SHA1 (patch-plugins_gdk-pixbuf_CMakeLists.txt) = b37e6d4f0e414c3eb4d1542d732873eb1425a0b2
diff --git a/libjxl/patches/patch-lib_jxl.cmake b/libjxl/patches/patch-lib_jxl.cmake
deleted file mode 100644
index 4d1d4528ce..0000000000
--- a/libjxl/patches/patch-lib_jxl.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-All linkers do not support --version-script, so test for it
-
---- lib/jxl.cmake.orig 2024-01-05 16:54:25.540798120 +0000
-+++ lib/jxl.cmake
-@@ -216,6 +216,11 @@ list(APPEND CMAKE_EXE_LINKER_FLAGS ${LIN
- check_c_source_compiles("int main(){return 0;}" LINKER_SUPPORT_EXCLUDE_LIBS)
- list(REMOVE_ITEM CMAKE_EXE_LINKER_FLAGS ${LINKER_EXCLUDE_LIBS_FLAG})
-
-+set(LINKER_VERSION_SCRIPT_FLAG "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/jxl/jxl.version")
-+list(APPEND CMAKE_EXE_LINKER_FLAGS ${LINKER_VERSION_SCRIPT_FLAG})
-+check_c_source_compiles("int main(){return 0;}" LINKER_VERSION_SCRIPT)
-+list(REMOVE_ITEM CMAKE_EXE_LINKER_FLAGS ${LINKER_VERSION_SCRIPT_FLAG})
-+
- if(NOT BUILD_SHARED_LIBS)
- target_compile_definitions(jxl PUBLIC -DJXL_STATIC_DEFINE)
- target_compile_definitions(jxl_dec PUBLIC -DJXL_STATIC_DEFINE)
-@@ -233,8 +238,10 @@ foreach(target IN ITEMS jxl jxl_dec)
- elseif(WIN32)
- # Nothing needed here, we use __declspec(dllexport) (jxl_export.h)
- else()
-+ if(LINKER_VERSION_SCRIPT)
- set_property(TARGET ${target} APPEND_STRING PROPERTY
- LINK_FLAGS " -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/jxl/jxl.version")
-+ endif() # LINKER_VERSION_SCRIPT
- endif() # APPLE
- # This hides the default visibility symbols from static libraries bundled into
- # the shared library. In particular this prevents exposing symbols from hwy
diff --git a/libjxl/patches/patch-lib_jxl__threads.cmake b/libjxl/patches/patch-lib_jxl__threads.cmake
deleted file mode 100644
index 29dcea9a26..0000000000
--- a/libjxl/patches/patch-lib_jxl__threads.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-All linkers do not support --version-script, so test for it
-
---- lib/jxl_threads.cmake.orig 2024-01-05 17:14:55.908788800 +0000
-+++ lib/jxl_threads.cmake
-@@ -46,8 +46,10 @@ if(APPLE)
- elseif(WIN32)
- # Nothing needed here, we use __declspec(dllexport) (jxl_threads_export.h)
- else()
-+ if(LINKER_VERSION_SCRIPT)
- set_property(TARGET jxl_threads APPEND_STRING PROPERTY
- LINK_FLAGS " -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/jxl/jxl.version")
-+ endif() # LINKER_VERSION_SCRIPT
- endif() # APPLE
-
- # Compile the shared library such that the JXL_THREADS_EXPORT symbols are
diff --git a/libjxl/patches/patch-plugins_gdk-pixbuf_CMakeLists.txt b/libjxl/patches/patch-plugins_gdk-pixbuf_CMakeLists.txt
deleted file mode 100644
index f838887e5c..0000000000
--- a/libjxl/patches/patch-plugins_gdk-pixbuf_CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-* adapt to make gdk-pixbuf plugin a separate package
-
---- plugins/gdk-pixbuf/CMakeLists.txt.orig 2024-01-05 13:15:08.412618939 +0000
-+++ plugins/gdk-pixbuf/CMakeLists.txt
-@@ -2,9 +2,13 @@
- #
- # Use of this source code is governed by a BSD-style
- # license that can be found in the LICENSE file.
-+cmake_minimum_required(VERSION 3.10)
-+project(gdl-pixbuf-jxl LANGUAGES C CXX)
-
- find_package(PkgConfig)
- pkg_check_modules(Gdk-Pixbuf IMPORTED_TARGET gdk-pixbuf-2.0>=2.36)
-+pkg_check_modules(JXL IMPORTED_TARGET libjxl libjxl_threads)
-+pkg_check_modules(LCMS2 IMPORTED_TARGET lcms2)
-
- include(GNUInstallDirs)
-
-@@ -25,7 +29,7 @@ set_target_properties(pixbufloader-jxl P
-
- # Note: This only needs the decoder library, but we don't install the decoder
- # shared library.
--target_link_libraries(pixbufloader-jxl jxl jxl_threads lcms2 PkgConfig::Gdk-Pixbuf)
-+target_link_libraries(pixbufloader-jxl PkgConfig::JXL PkgConfig::LCMS2 PkgConfig::Gdk-Pixbuf)
-
- execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} gdk-pixbuf-2.0 --variable gdk_pixbuf_moduledir --define-variable=prefix=${CMAKE_INSTALL_PREFIX} OUTPUT_VARIABLE GDK_PIXBUF_MODULEDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
- install(TARGETS pixbufloader-jxl DESTINATION "${GDK_PIXBUF_MODULEDIR}")
Home |
Main Index |
Thread Index |
Old Index