libjpeg: drop freeimage support
That package seems dead, and it just increases maintenance burden.
This commit is contained in:
@@ -1,21 +0,0 @@
|
||||
Subject: [PATCH] Compile transupp.c as part of the library
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -615,7 +615,7 @@
|
||||
src/jcparam.c src/jcphuff.c src/jctrans.c src/jdapimin.c src/jdatadst.c
|
||||
src/jdatasrc.c src/jdhuff.c src/jdicc.c src/jdinput.c src/jdlhuff.c
|
||||
src/jdmarker.c src/jdmaster.c src/jdphuff.c src/jdtrans.c src/jerror.c
|
||||
- src/jfdctflt.c src/jmemmgr.c src/jmemnobs.c src/jpeg_nbits.c)
|
||||
+ src/jfdctflt.c src/jmemmgr.c src/jmemnobs.c src/jpeg_nbits.c src/transupp.c)
|
||||
|
||||
if(WITH_ARITH_ENC OR WITH_ARITH_DEC)
|
||||
set(JPEG_SOURCES ${JPEG_SOURCES} src/jaricom.c)
|
||||
@@ -2066,7 +2066,7 @@
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/jerror.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/src/jmorecfg.h
|
||||
- ${CMAKE_CURRENT_SOURCE_DIR}/src/jpeglib.h
|
||||
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/jpeglib.h ${CMAKE_CURRENT_SOURCE_DIR}/src/transupp.h
|
||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT include)
|
||||
|
||||
include(cmakescripts/BuildPackages.cmake)
|
||||
@@ -1,69 +0,0 @@
|
||||
Subject: [PATCH] Make exported symbols in transupp.c weak
|
||||
|
||||
The exported symbols are made weak to not conflict with users
|
||||
of the library that already vendor this functionality.
|
||||
--- a/src/transupp.c
|
||||
+++ b/src/transupp.c
|
||||
@@ -1392,7 +1392,7 @@
|
||||
* This code is loosely based on XParseGeometry from the X11 distribution.
|
||||
*/
|
||||
|
||||
-GLOBAL(boolean)
|
||||
+GLOBAL(boolean) __attribute__((weak))
|
||||
jtransform_parse_crop_spec(jpeg_transform_info *info, const char *spec)
|
||||
{
|
||||
info->crop = FALSE;
|
||||
@@ -1492,7 +1492,7 @@
|
||||
* and transformation is not perfect. Otherwise returns TRUE.
|
||||
*/
|
||||
|
||||
-GLOBAL(boolean)
|
||||
+GLOBAL(boolean) __attribute__((weak))
|
||||
jtransform_request_workspace(j_decompress_ptr srcinfo,
|
||||
jpeg_transform_info *info)
|
||||
{
|
||||
@@ -2039,7 +2039,7 @@
|
||||
* to jpeg_write_coefficients().
|
||||
*/
|
||||
|
||||
-GLOBAL(jvirt_barray_ptr *)
|
||||
+GLOBAL(jvirt_barray_ptr *) __attribute__((weak))
|
||||
jtransform_adjust_parameters(j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
|
||||
jvirt_barray_ptr *src_coef_arrays,
|
||||
jpeg_transform_info *info)
|
||||
@@ -2158,7 +2158,7 @@
|
||||
* Note that some transformations will modify the source data arrays!
|
||||
*/
|
||||
|
||||
-GLOBAL(void)
|
||||
+GLOBAL(void) __attribute__((weak))
|
||||
jtransform_execute_transform(j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
|
||||
jvirt_barray_ptr *src_coef_arrays,
|
||||
jpeg_transform_info *info)
|
||||
@@ -2270,7 +2270,7 @@
|
||||
* (may use custom action then)
|
||||
*/
|
||||
|
||||
-GLOBAL(boolean)
|
||||
+GLOBAL(boolean) __attribute__((weak))
|
||||
jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height,
|
||||
int MCU_width, int MCU_height,
|
||||
JXFORM_CODE transform)
|
||||
@@ -2309,7 +2309,7 @@
|
||||
* This must be called before jpeg_read_header() to have the desired effect.
|
||||
*/
|
||||
|
||||
-GLOBAL(void)
|
||||
+GLOBAL(void) __attribute__((weak))
|
||||
jcopy_markers_setup(j_decompress_ptr srcinfo, JCOPY_OPTION option)
|
||||
{
|
||||
#ifdef SAVE_MARKERS_SUPPORTED
|
||||
@@ -2342,7 +2342,7 @@
|
||||
* JFIF APP0 or Adobe APP14 markers if selected.
|
||||
*/
|
||||
|
||||
-GLOBAL(void)
|
||||
+GLOBAL(void) __attribute__((weak))
|
||||
jcopy_markers_execute(j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
|
||||
JCOPY_OPTION option)
|
||||
{
|
||||
@@ -42,13 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
patches =
|
||||
[
|
||||
# This is needed by freeimage
|
||||
./0001-Compile-transupp.c-as-part-of-the-library.patch
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isMinGW) [
|
||||
./0002-Make-exported-symbols-in-transupp.c-weak.patch
|
||||
]
|
||||
[ ]
|
||||
++ lib.optionals stdenv.hostPlatform.isMinGW [
|
||||
./mingw-boolean.patch
|
||||
];
|
||||
@@ -56,16 +50,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
outputs = [
|
||||
"bin"
|
||||
"dev"
|
||||
"dev_private"
|
||||
"out"
|
||||
"man"
|
||||
"doc"
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
moveToOutput include/transupp.h $dev_private
|
||||
'';
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
cmake
|
||||
@@ -100,6 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
dev_private = throw "not supported anymore";
|
||||
tests = {
|
||||
inherit
|
||||
dvgrab
|
||||
|
||||
Reference in New Issue
Block a user