pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics/imlib2
Module Name: pkgsrc
Committed By: schmonz
Date: Sat Apr 27 03:05:38 UTC 2024
Modified Files:
pkgsrc/graphics/imlib2: Makefile PLIST buildlink3.mk distinfo
options.mk
pkgsrc/graphics/imlib2/patches: patch-src_bin_imlib2__view.c
Removed Files:
pkgsrc/graphics/imlib2/patches: patch-src_modules_loaders_Makefile.am
patch-src_modules_loaders_Makefile.in
Log Message:
imlib2: update to 1.12.2. Changes:
v1.12.2 - 2024-02-03
--------------------
Chema Gonzalez (3):
Y4M loader: fix support for unexpected framerates
Y4M loader: fix C option analysis
Y4M loader: add error messages on parsing errors
Kim Woelders (15):
test_save: Update crcs for jxl saver (libjxl 0.8.0)
x11_grab: Remove some obsolete code
Y4M loader: Guard some debug code properly
Consistently use #if IMLIB2_DEBUG (not #ifdef)
test_load_2: Check some more y4m files
Y4M loader: Avoid use of sscanf() in frame rate parsing
ANI loader: Avoid debug line when image does not have proper signature
PNG loader: Properly suppress messages from libpng
Y4M loader: Fix warning in non-debug build
Change formatting style
PNG saver: Avoid potential issues around setjmp/longjmp
JPG saver: Fix error path
TIFF loader: Properly suppress messages from libtiff
savers: Fix error returns
NRK (2):
PNG saver: avoid double-free on write errors
Y4M loader: don't fail on newline
v1.12.1 - 2023-09-21
--------------------
Kim Woelders (12):
Fix some clang complaints
scaling: MMX asm scaling causes segv, disable for now
loading: Call module exit function also when not dlclosing module on unload
loaders: Fix build with -m32 --enable-debug
test_load_2: Add forgotten xeyes.png
test_save: Fix for jxl loader on ix86
test_scale: MMX scaling is disabled
RAW loader: Don't unload loader
loaders: Fix CPPFLAGS order
imlib2_grab, imlib2_view: Unset context colormap
x11_grab: Use correct depth when grabbing
v1.12.0 - 2023-08-17
--------------------
Chema Gonzalez (3):
test_load2: make error messages more descriptive
Y4M loader: fix support for 420 colorspaces
Y4M loader: add support for images with unexpected aspects
Kim Woelders (46):
imlib2_view: Avoid potential use of uninitialized data
GIF loader: Enable showing animated images even if truncated
Introduce __imlib_perror() to produce error messages
loaders: Use common function to print error messages
imlib2_load: Move time_us() to separate file
imlib2_conv: Add option to time save operations
test: Fix pr_info() when not printing to stdout
loading: Enable calling function on loader load/unload
HEIF loader: Call heif_[de]init() on loader load/unload
autofoo: Don't check for freetype if we are building without text
QOI loader: Add progress calback, indent, cosmetics
Loaders: Static constify some data that may as well be
TGA loader: Fix TGA v2.0 signature check
test: Add basic qoi checks
test_scale: Test scaling some more
scaling: Unifdef OLD_SCALE_DOWN
scaling: Correct scaleinfo array length
scaling: Move scaling function call sequence into common __imlib_Scale()
scaling: Cosmetics (comments)
scaling: Simplify scaling points calculation (eliminate j)
scaling: Change ypoints[] from pointers to indices
scaling: Cosmetics
scaling: Minor refactoring
scaling: Correct scaling up
test_scale: Update for new scaling
image: Fix missing munmap() when using imlib_load_image_fd()
image: Fix potentially using incorrect file size
file: Remove a couple of unused functions
image: Fix potentially using incorrect file size - fixup
test: Bypass wrappers when running tests
test_load: Minor fix in debug message
Add new raw loader
TIFF loader: Slightly more strict signature check
image: Use sub-second time info when available
image: Fix preservation of alpha chanel flag in imlib_clone_image()
image cache: Avoid negative refcounts
image cache: Drop redundant cleanup
image cache: Rework cleanup
Revert "scaling: Correct scaling up"
Revert "test_scale: Update for new scaling"
scaling: Various trivial changes
scaling: Improve non-AA scale-up case
scaling: Correct scaling up - take 2
test_scale: Update for new scaling (re-applied)
test_scale: Exercise non-AA path too
NRK (11):
WEBP saver: allow lossless and respect compression tag
add a new QOI decoder
QOI loader: fix build on non-gnu compilers
QOI loader: use memcmp for magic and endmarker check
Y4M loader: check file size before magic check
loading: add some debug logs
loading: check for alloc failure
Y4M loader: use custom y4m parser
test_load: allow y4m memory loading
file: Remove unused functions some more
introduce imlib_image_decache_file()
v1.11.1 - 2023-05-01
--------------------
Chema Gonzalez (2):
imlib2: added loader for y4m files (uses liby4m and libyuv)
imlib2: add y4m test examples
Kim Woelders (14):
autofoo: More CLEANFILES
HEIF loader: Add some debug
Y4M loader: Various minor changes
test_load: Add some missing ifdefs
test_load: Add some y4m checks
test: Print some progress info in a couple of tests
modules: Drop some disabled code
autofoo: Tweak PACKAGE_DATA_DIR definition
XPM loader: Add rgb.txt
loaders: Fix loaders potentially being loaded more than once
loaders: Change method used to not unload loaders
Add JXL saver
loaders: Cosmetics
v1.11.0 - 2023-03-09
--------------------
Guilherme Janczak (1):
remove bad unused function
Kim Woelders (54):
test: Add a few tests for obscure pnm formats
test: Add some pam tests
Avoid some more undefined behaviors with shifts
api: Fix code duplication around some __imlib_BlendImageToImage() calls
api: Change some parameter names
api: Tweak/correct error handling in drawable grabbing functions
image: Let __imlib_CreateImage() allocate pixel data buffer
Drop some redundant calls to __imlib_LoadImageData()
api: Remember error on deferred image data loads
imlib2_load: Show error on deferred data load problem
imlib2_view: Be more verbose about load errors
PNM loader: Speedups
test: Introduce image_get_crc32()
test: test_save: Trivial changes
test: test_save: Check that files are written and ok
PNM saver: Write images with alpha as P7 PAM RGB_ALPHA type
x11_rgba: Add missing const
x11_grab: Avoid cast-align warnings with -Wcast-align=strict
x11_rgba: Avoid cast-align warnings with -Wcast-align=strict
Loaders: Debug macro cleanups
ANI loader: Use struct to access chunk data
Loaders: Avoid cast-align warnings with -Wcast-align=strict
autofoo: Add __PACKED__ for optional struct packing
ANI, PNG, TGA loaders: Enable handling of unaligned data
__imlib_FileDir(): Fix missing closedir() on OOM
Loaders: decompress_load() is not part of the loader API
Loaders: Debug tweaks
Savers: Centralize file open/close
JPG saver: Avoid potential clobber warning
PNG saver: Avoid potential clobber warning
Loaders, savers: Handle EINTR during fopen()
api: Remove pointless statement
api: Update documentation for imlib_get_error()
api: Cosmetics around image save functions
api: Minor simplification in error handling in save functions
Add imlib_save_image_fd()
api: Oops - debug--
test_grab: Rearrange code
x11_grab: Let __imlib_Grab..() return error instead of ok
x11_grab: Eliminate unnecessary pixmap copy
imlib_create_scaled_image_from_drawable(): Simplify call path
x11_grab: Drop now unused 1:1 scaling path in __imlib_GrabDrawableScaledToRGBA()
imlib2_view: Add option to set background checkerboard field size
test_grab: Update
test_grab: Add some tests for imlib_copy_drawable_to_image()
test_grab: Check get-mask-from-shape too
x11: Pass X11 context around by struct
x11_grab: Move window/pixmap checking to separate function
x11_grab: Rework clipping
x11_grab: Clear image pixels not actually grabbed
x11_grab: Various fixes in __imlib_GrabDrawableScaledToRGBA()
x11_grab: Eliminate some overhead in scaled grabbing
test_grab: Debug tweak
NRK (1):
PNM loader: avoid some undefined behavior
q3cpma (1):
PNM loader: add read support for PAM
v1.10.0 - 2022-12-17
--------------------
Kim Woelders (63):
Introduce imlib_load_image_fde()
imlib2_load: Tweak load mode handling
Introduce Imlib2_Loader.h - all that is needed by loaders
image: Change has alpha flag to separate byte
loading: Don't look for cached image when not caching
loading: New loader infrastructure
loading: Introduce __imlib_ImageFileContextPush/Pop()
loading: Centralize mmap handling
Introduce imlib_load_image_mem()
imlib2_load: Add option to use imlib_load_image_mem()
api: Remove cast previously dropped everywhere else
Hide imlib_get/set_color_usage() if no X11
api: Move X11 related functions to separate file
api: Move filter functions to separate file
Enable disabling filter functions
api: Move text functions to separate file
Enable disabling text functions
J2K loader: Drop showing deprecated item in debug message
image: Fix memory leak when cloning images
Unify basic X11 functionality in test programs
Includes tweaks
test: Re-generate test images with recent tool/library versions
image: Hide internal ImlibImageFileInfo struct
image: Don't munmap external memory
Introduce imlib_get_error()
api: error_return adjustments
imlib2_load: Add option to enable image caching
image: Fix potential use of uninitialized time stamps
PNG loader: Correct frame delay in zero denominator case
PNG loader: Cosmetics
PNG loader: Improved handling of animated PNGs
multiframe: Support loop count
PNG loader: Fix animated PNG loading some more
autofoo: Fix trouble with test subdirectory in distributed source
autofoo: Rework git tag/release stuff
test: test_load: Quit when loading primary image fails
SVG loader: Don't reference multiframe stuff
ICO loader: Eliminate ico_load()
autofoo: Use AC_USE_SYSTEM_EXTENSIONS
imlib2_view: Fix single frame update rendering
test: test_load_2: Check frame 0/1 loading too
PNG loader: Cosmetics
PS loader: Cosmetics
multiframe: Tweaks around frame number handling
multiframe: Centralize handling of frame update offsets
multiframe: Move frame info to allocated record
multiframe: Allocate frame info only when needed
PNG loader: Quit scan when target fdAT is seen
PNG loader: Quit after loading first frame
PNG loader: Simplify update callback handling
imlib2_view: Fix multiframe rendering detail
multiframe: Remove frame offset from updates
imlib2_view: Fix multiframe after update coordinate change
imlib2_view: Deal with all pending X events at once
imlib2_view: Properly handle caching vs progress callbacks
imlib2_view: Don't load bad images twice if first or last in argument list
image: Cosmetics
image: Introduce __imlib_LoadEmbeddedMem()
Add new ani loader
image: Cosmetics (slightly more consisent naming)
ANI loader: Disable progress in embed loader
ANI loader: Multiframe suport
NRK (3):
Introduce imlib_load_image_frame_mem
imlib_load_image_frame_mem(): set nocache
TGA loader: fix indexing in tgaflip
pkgsrc changes:
- options: enable 'heif' by default
- buildlink: remove back-compatibility with 2007 pre-x11-option package
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 pkgsrc/graphics/imlib2/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/graphics/imlib2/PLIST
cvs rdiff -u -r1.39 -r1.40 pkgsrc/graphics/imlib2/buildlink3.mk
cvs rdiff -u -r1.50 -r1.51 pkgsrc/graphics/imlib2/distinfo
cvs rdiff -u -r1.15 -r1.16 pkgsrc/graphics/imlib2/options.mk
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/graphics/imlib2/patches/patch-src_bin_imlib2__view.c
cvs rdiff -u -r1.1 -r0 \
pkgsrc/graphics/imlib2/patches/patch-src_modules_loaders_Makefile.am \
pkgsrc/graphics/imlib2/patches/patch-src_modules_loaders_Makefile.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/graphics/imlib2/Makefile
diff -u pkgsrc/graphics/imlib2/Makefile:1.91 pkgsrc/graphics/imlib2/Makefile:1.92
--- pkgsrc/graphics/imlib2/Makefile:1.91 Sat Apr 6 09:32:58 2024
+++ pkgsrc/graphics/imlib2/Makefile Sat Apr 27 03:05:37 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.91 2024/04/06 09:32:58 wiz Exp $
+# $NetBSD: Makefile,v 1.92 2024/04/27 03:05:37 schmonz Exp $
-DISTNAME= imlib2-1.9.1
-PKGREVISION= 6
+DISTNAME= imlib2-1.12.2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
EXTRACT_SUFX= .tar.xz
@@ -14,6 +13,20 @@ LICENSE= mit # with some modifications
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --with-gif
+CONFIGURE_ARGS+= --with-jpeg
+CONFIGURE_ARGS+= --without-j2k
+CONFIGURE_ARGS+= --without-jxl
+CONFIGURE_ARGS+= --with-png
+CONFIGURE_ARGS+= --without-ps
+CONFIGURE_ARGS+= --without-raw
+CONFIGURE_ARGS+= --without-svg
+CONFIGURE_ARGS+= --with-tiff
+CONFIGURE_ARGS+= --without-y4m
+CONFIGURE_ARGS+= --with-bz2
+CONFIGURE_ARGS+= --with-lzma
+CONFIGURE_ARGS+= --with-zlib
+CONFIGURE_ARGS+= --without-id3
PKGCONFIG_OVERRIDE= imlib2.pc.in
Index: pkgsrc/graphics/imlib2/PLIST
diff -u pkgsrc/graphics/imlib2/PLIST:1.18 pkgsrc/graphics/imlib2/PLIST:1.19
--- pkgsrc/graphics/imlib2/PLIST:1.18 Mon Mar 18 18:37:19 2024
+++ pkgsrc/graphics/imlib2/PLIST Sat Apr 27 03:05:37 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2024/03/18 18:37:19 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.19 2024/04/27 03:05:37 schmonz Exp $
${PLIST.x11}bin/imlib2_bumpmap
${PLIST.x11}bin/imlib2_colorspace
bin/imlib2_conv
@@ -9,9 +9,11 @@ ${PLIST.x11}bin/imlib2_show
${PLIST.x11}bin/imlib2_test
${PLIST.x11}bin/imlib2_view
include/Imlib2.h
+include/Imlib2_Loader.h
lib/imlib2/filters/bumpmap.la
lib/imlib2/filters/colormod.la
lib/imlib2/filters/testfilter.la
+lib/imlib2/loaders/ani.la
lib/imlib2/loaders/argb.la
lib/imlib2/loaders/bmp.la
lib/imlib2/loaders/bz2.la
@@ -24,6 +26,7 @@ lib/imlib2/loaders/lbm.la
lib/imlib2/loaders/lzma.la
lib/imlib2/loaders/png.la
lib/imlib2/loaders/pnm.la
+lib/imlib2/loaders/qoi.la
lib/imlib2/loaders/tga.la
lib/imlib2/loaders/tiff.la
${PLIST.webp}lib/imlib2/loaders/webp.la
@@ -54,3 +57,4 @@ share/imlib2/data/images/sh2.png
share/imlib2/data/images/sh3.png
share/imlib2/data/images/stop.png
share/imlib2/data/images/tnt.png
+share/imlib2/rgb.txt
Index: pkgsrc/graphics/imlib2/buildlink3.mk
diff -u pkgsrc/graphics/imlib2/buildlink3.mk:1.39 pkgsrc/graphics/imlib2/buildlink3.mk:1.40
--- pkgsrc/graphics/imlib2/buildlink3.mk:1.39 Sun Nov 12 13:22:02 2023
+++ pkgsrc/graphics/imlib2/buildlink3.mk Sat Apr 27 03:05:37 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.39 2023/11/12 13:22:02 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.40 2024/04/27 03:05:37 schmonz Exp $
BUILDLINK_TREE+= imlib2
@@ -12,21 +12,12 @@ BUILDLINK_PKGSRCDIR.imlib2?= ../../graph
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../mk/bsd.fast.prefs.mk"
-
-_IMLIB2_PRE_X11_OPTION!= \
- if ${PKG_INFO} -qe 'imlib2<=1.4.0'; then \
- ${ECHO} yes; \
- else \
- ${ECHO} no; \
- fi
-
pkgbase := imlib2
.include "../../mk/pkg-build-options.mk"
-.if ${_IMLIB2_PRE_X11_OPTION} == "yes" || ${PKG_BUILD_OPTIONS.imlib2:Mx11}
-.include "../../x11/libXext/buildlink3.mk"
+.if ${PKG_BUILD_OPTIONS.imlib2:Mx11}
.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
.endif
.endif # IMLIB2_BUILDLINK3_MK
Index: pkgsrc/graphics/imlib2/distinfo
diff -u pkgsrc/graphics/imlib2/distinfo:1.50 pkgsrc/graphics/imlib2/distinfo:1.51
--- pkgsrc/graphics/imlib2/distinfo:1.50 Mon Mar 18 18:37:19 2024
+++ pkgsrc/graphics/imlib2/distinfo Sat Apr 27 03:05:38 2024
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.50 2024/03/18 18:37:19 schmonz Exp $
+$NetBSD: distinfo,v 1.51 2024/04/27 03:05:38 schmonz Exp $
-BLAKE2s (imlib2-1.9.1.tar.xz) = 58f6cdd4dac5d538bd74cf4c0a939f2e87293042861672c6f930dc4b93d70ab7
-SHA512 (imlib2-1.9.1.tar.xz) = 00eb8804a32e1403614e9f899f358dd9797f4bcfa7e9fdecd37992731019933e39834a60bd20be8fb69a35161ba1e784bd638b5ecb626d01a4f69c70c330e5f1
-Size (imlib2-1.9.1.tar.xz) = 813104 bytes
-SHA1 (patch-src_bin_imlib2__view.c) = 53a7bdb2e1f8687db095b796b46945ee5a72f552
+BLAKE2s (imlib2-1.12.2.tar.xz) = be2bd17f10fcfa90038d279c55b9158d7e4e8cae88c8532e41e29c211f576ade
+SHA512 (imlib2-1.12.2.tar.xz) = 3bffb8f0f6b3ec73a81f1d0c6ef3a3443425677cd8a1950422f102b67769c06df54128b21f84bd6c7880120cc5ec6f30d2ab134b3c001ad77f2d39efd749a5b7
+Size (imlib2-1.12.2.tar.xz) = 831812 bytes
+SHA1 (patch-src_bin_imlib2__view.c) = b819e6e05d2d9df27e21327af7811e41b9f7aff5
SHA1 (patch-src_lib_amd64__blend.S) = 09e89c6b1d6fb622b3ee88f6c3a5e9b6f3ab3fad
SHA1 (patch-src_lib_amd64__blend__cmod.S) = d533eeacd4b196086f1854c657d3e0773596790b
-SHA1 (patch-src_modules_loaders_Makefile.am) = 00c441c3c0227b6eba9afd526a03caea1ec3f51f
-SHA1 (patch-src_modules_loaders_Makefile.in) = 9f3326cbe20272b6b33e96b5898466cdfeba8d3f
Index: pkgsrc/graphics/imlib2/options.mk
diff -u pkgsrc/graphics/imlib2/options.mk:1.15 pkgsrc/graphics/imlib2/options.mk:1.16
--- pkgsrc/graphics/imlib2/options.mk:1.15 Mon Mar 18 18:37:19 2024
+++ pkgsrc/graphics/imlib2/options.mk Sat Apr 27 03:05:38 2024
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.15 2024/03/18 18:37:19 schmonz Exp $
+# $NetBSD: options.mk,v 1.16 2024/04/27 03:05:38 schmonz Exp $
.include "../../mk/bsd.prefs.mk"
PKG_OPTIONS_VAR= PKG_OPTIONS.imlib2
PKG_SUPPORTED_OPTIONS= heif libwebp x11
-PKG_SUGGESTED_OPTIONS= libwebp x11
+PKG_SUGGESTED_OPTIONS= heif libwebp x11
.if ${MACHINE_ARCH} == "i386"
PKG_SUPPORTED_OPTIONS+= mmx
.elif ${MACHINE_ARCH} == "x86_64" && empty(PKGSRC_COMPILER:Mclang)
Index: pkgsrc/graphics/imlib2/patches/patch-src_bin_imlib2__view.c
diff -u pkgsrc/graphics/imlib2/patches/patch-src_bin_imlib2__view.c:1.1 pkgsrc/graphics/imlib2/patches/patch-src_bin_imlib2__view.c:1.2
--- pkgsrc/graphics/imlib2/patches/patch-src_bin_imlib2__view.c:1.1 Thu Feb 20 15:14:57 2020
+++ pkgsrc/graphics/imlib2/patches/patch-src_bin_imlib2__view.c Sat Apr 27 03:05:38 2024
@@ -1,14 +1,14 @@
-$NetBSD: patch-src_bin_imlib2__view.c,v 1.1 2020/02/20 15:14:57 nia Exp $
+$NetBSD: patch-src_bin_imlib2__view.c,v 1.2 2024/04/27 03:05:38 schmonz Exp $
Include sys/time.h for timeval.
---- src/bin/imlib2_view.c.orig 2019-12-11 17:55:27.000000000 +0000
+--- src/bin/imlib2_view.c.orig 2024-02-03 15:58:21.000000000 +0000
+++ src/bin/imlib2_view.c
-@@ -2,6 +2,7 @@
+@@ -3,6 +3,7 @@
#include <X11/Xlib.h>
#include <X11/keysym.h>
+#include <sys/time.h>
#include <stdio.h>
#include <stdlib.h>
- #include <errno.h>
+ #include <string.h>
Home |
Main Index |
Thread Index |
Old Index