FreeBSD Bugzilla – Attachment 244899 Details for
Bug 273832
graphics/webp: Update to 1.3.2
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for webp
webp-132.patch (text/plain), 6.70 KB, created by
Daniel Engberg
on 2023-09-15 19:20:11 UTC
(
hide
)
Description:
Patch for webp
Filename:
MIME Type:
Creator:
Daniel Engberg
Created:
2023-09-15 19:20:11 UTC
Size:
6.70 KB
patch
obsolete
>diff --git a/graphics/webp/Makefile b/graphics/webp/Makefile >index c7fecd86adcc..70b8ad7107aa 100644 >--- a/graphics/webp/Makefile >+++ b/graphics/webp/Makefile >@@ -1,10 +1,9 @@ > PORTNAME= webp >-PORTVERSION= 1.3.1 >-PORTREVISION= 1 >+DISTVERSION= 1.3.2 > CATEGORIES= graphics >-MASTER_SITES= http://downloads.webmproject.org/releases/webp/ \ >- https://storage.googleapis.com/downloads.webmproject.org/releases/webp/ >-DISTNAME= libwebp-${PORTVERSION} >+MASTER_SITES= http://downloads.webmproject.org/releases/${PORTNAME}/ \ >+ https://storage.googleapis.com/downloads.webmproject.org/releases/${PORTNAME}/ >+DISTNAME= lib${PORTNAME}-${DISTVERSION} > > MAINTAINER= sunpoet@FreeBSD.org > COMMENT= Google WebP image format conversion tool >@@ -13,32 +12,30 @@ WWW= https://developers.google.com/speed/webp > LICENSE= BSD3CLAUSE > LICENSE_FILE= ${WRKSRC}/COPYING > >-USES= compiler:c11 libtool localbase >- >-CONFIGURE_ARGS= --enable-libwebpdecoder \ >- --enable-libwebpdemux \ >- --enable-libwebpmux \ >- --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig >-GNU_CONFIGURE= yes >-INSTALL_TARGET= install-strip >+USES= cmake compiler:c11 pathfix > USE_LDCONFIG= yes > > PORTSCOUT= limit:^[0-9\.]*$$ > >+CMAKE_ON= BUILD_SHARED_LIBS >+CMAKE_ARGS= -DCMAKE_DISABLE_FIND_PACKAGE_SDL:BOOL=True \ >+ -DCMAKE_INSTALL_MANDIR=man >+ > OPTIONS_DEFINE= IMGCONV X11 > OPTIONS_DEFAULT=IMGCONV > OPTIONS_SUB= yes >+ > IMGCONV_DESC= Install converters to/from WebP > >-IMGCONV_CONFIGURE_OFF= build_cwebp=no build_dwebp=no build_gif2webp=no build_img2webp=no >-IMGCONV_CONFIGURE_ON= build_cwebp=yes build_dwebp=yes build_gif2webp=yes build_img2webp=yes > IMGCONV_LIB_DEPENDS= libgif.so:graphics/giflib \ > libpng.so:graphics/png \ > libtiff.so:graphics/tiff > IMGCONV_USES= jpeg >-X11_CONFIGURE_OFF= build_vwebp=no >-X11_CONFIGURE_ON= build_vwebp=yes >-X11_USE= GL=glut >-X11_USES= gl >+IMGCONV_CMAKE_BOOL= WEBP_BUILD_CWEBP WEBP_BUILD_DWEBP \ >+ WEBP_BUILD_GIF2WEBP WEBP_BUILD_IMG2WEBP >+ >+X11_USES= gl localbase:ldflags >+X11_USE= GL=glu,glut,opengl >+X11_CMAKE_BOOL= WEBP_BUILD_VWEBP > > .include <bsd.port.mk> >diff --git a/graphics/webp/distinfo b/graphics/webp/distinfo >index 03db797006ce..8e0f32acc987 100644 >--- a/graphics/webp/distinfo >+++ b/graphics/webp/distinfo >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1688166062 >-SHA256 (libwebp-1.3.1.tar.gz) = b3779627c2dfd31e3d8c4485962c2efe17785ef975e2be5c8c0c9e6cd3c4ef66 >-SIZE (libwebp-1.3.1.tar.gz) = 4161782 >+TIMESTAMP = 1694718190 >+SHA256 (libwebp-1.3.2.tar.gz) = 2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4 >+SIZE (libwebp-1.3.2.tar.gz) = 4162949 >diff --git a/graphics/webp/files/patch-CMakeLists.txt b/graphics/webp/files/patch-CMakeLists.txt >new file mode 100644 >index 000000000000..f546d9ae05ca >--- /dev/null >+++ b/graphics/webp/files/patch-CMakeLists.txt >@@ -0,0 +1,48 @@ >+--- CMakeLists.txt.orig 2023-09-14 19:07:05 UTC >++++ CMakeLists.txt >+@@ -112,11 +112,11 @@ endif() >+ include(cmake/deps.cmake) >+ include(GNUInstallDirs) >+ >+-if(BUILD_SHARED_LIBS AND NOT DEFINED CMAKE_INSTALL_RPATH) >+- # Set the rpath to match autoconf/libtool behavior. Note this must be set >+- # before target creation. >+- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") >+-endif() >++# if(BUILD_SHARED_LIBS AND NOT DEFINED CMAKE_INSTALL_RPATH) >++# # Set the rpath to match autoconf/libtool behavior. Note this must be set >++# # before target creation. >++# set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") >++# endif() >+ >+ # ############################################################################## >+ # Options. >+@@ -564,8 +564,8 @@ endif() >+ >+ if(WEBP_BUILD_VWEBP) >+ # vwebp >+- find_package(GLUT) >+- if(GLUT_FOUND) >++ find_package(FreeGLUT) >++ if(FreeGLUT_FOUND) >+ include_directories(${WEBP_DEP_IMG_INCLUDE_DIRS}) >+ parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "VWEBP_SRCS" "vwebp") >+ add_executable(vwebp ${VWEBP_SRCS}) >+@@ -573,7 +573,7 @@ if(WEBP_BUILD_VWEBP) >+ vwebp >+ ${OPENGL_LIBRARIES} >+ exampleutil >+- GLUT::GLUT >++ glut >+ imageioutil >+ webp >+ webpdemux) >+@@ -735,7 +735,7 @@ install( >+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} >+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} >+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) >+-set(ConfigPackageLocation ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake/) >++set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/) >+ install(EXPORT ${PROJECT_NAME}Targets NAMESPACE ${PROJECT_NAME}:: >+ DESTINATION ${ConfigPackageLocation}) >+ >diff --git a/graphics/webp/files/patch-configure b/graphics/webp/files/patch-configure >deleted file mode 100644 >index be9e6bde0dba..000000000000 >--- a/graphics/webp/files/patch-configure >+++ /dev/null >@@ -1,10 +0,0 @@ >---- configure.orig 2022-08-05 23:55:13 UTC >-+++ configure >-@@ -14928,7 +14928,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu >- LIBS=$SAVED_LIBS >- >- if test "$glut_support" = "yes" -a "$enable_libwebpdemux" = "yes"; then >-- build_vwebp=yes >- else >- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Not building vwebp. OpenGL libraries and --enable-libwebpdemux are required." >&5 >- printf "%s\n" "$as_me: Not building vwebp. OpenGL libraries and --enable-libwebpdemux are required." >&6;} >diff --git a/graphics/webp/files/patch-examples_vwebp.c b/graphics/webp/files/patch-examples_vwebp.c >new file mode 100644 >index 000000000000..2635b3c3fea0 >--- /dev/null >+++ b/graphics/webp/files/patch-examples_vwebp.c >@@ -0,0 +1,11 @@ >+--- examples/vwebp.c.orig 2023-09-13 22:11:07 UTC >++++ examples/vwebp.c >+@@ -27,7 +27,7 @@ >+ #if defined(HAVE_GLUT_GLUT_H) >+ #include <GLUT/glut.h> >+ #else >+-#include <GL/glut.h> >++#include <GL/freeglut.h> >+ #ifdef FREEGLUT >+ #include <GL/freeglut.h> >+ #endif >diff --git a/graphics/webp/pkg-plist b/graphics/webp/pkg-plist >index cc44287b8be1..e5aeaff45dc0 100644 >--- a/graphics/webp/pkg-plist >+++ b/graphics/webp/pkg-plist >@@ -13,26 +13,25 @@ include/webp/mux_types.h > include/webp/sharpyuv/sharpyuv.h > include/webp/sharpyuv/sharpyuv_csp.h > include/webp/types.h >-lib/libsharpyuv.a >+lib/cmake/WebP/WebPConfig.cmake >+lib/cmake/WebP/WebPConfigVersion.cmake >+lib/cmake/WebP/WebPTargets-%%CMAKE_BUILD_TYPE%%.cmake >+lib/cmake/WebP/WebPTargets.cmake > lib/libsharpyuv.so > lib/libsharpyuv.so.0 > lib/libsharpyuv.so.0.0.1 >-lib/libwebp.a > lib/libwebp.so > lib/libwebp.so.7 >-lib/libwebp.so.7.1.7 >-lib/libwebpdecoder.a >+lib/libwebp.so.7.1.8 > lib/libwebpdecoder.so > lib/libwebpdecoder.so.3 >-lib/libwebpdecoder.so.3.1.7 >-lib/libwebpdemux.a >+lib/libwebpdecoder.so.3.1.8 > lib/libwebpdemux.so > lib/libwebpdemux.so.2 >-lib/libwebpdemux.so.2.0.13 >-lib/libwebpmux.a >+lib/libwebpdemux.so.2.0.14 > lib/libwebpmux.so > lib/libwebpmux.so.3 >-lib/libwebpmux.so.3.0.12 >+lib/libwebpmux.so.3.0.13 > libdata/pkgconfig/libsharpyuv.pc > libdata/pkgconfig/libwebp.pc > libdata/pkgconfig/libwebpdecoder.pc
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 273832
: 244899