Attachment #244919 for bug #273766




PORTNAME=	webp
DISTVERSION=	1.3.2
PORTREVISION=	1
CATEGORIES=	graphics
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

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		cmake compiler:c11 pathfix

CONFIGURE_ARGS=	--enable-libwebpdecoder \
		--enable-libwebpdemux  \
		--enable-libwebpmux \
		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
GNU_CONFIGURE=	yes
INSTALL_TARGET=	install-strip
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
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>

Lines 1-3 Link Here

(-)b/graphics/webp/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1688166062	1	TIMESTAMP = 1694718190
2	SHA256 (libwebp-1.3.1.tar.gz) = b3779627c2dfd31e3d8c4485962c2efe17785ef975e2be5c8c0c9e6cd3c4ef66	2	SHA256 (libwebp-1.3.2.tar.gz) = 2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4
3	SIZE (libwebp-1.3.1.tar.gz) = 4161782	3	SIZE (libwebp-1.3.2.tar.gz) = 4162949




--- 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})
 

Removed Link Here

(-)a/graphics/webp/files/patch-configure (-10 lines)
1	--- configure.orig 2022-08-05 23:55:13 UTC
2	+++ configure
3	@@ -14928,7 +14928,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
4	LIBS=$SAVED_LIBS
5
6	if test "$glut_support" = "yes" -a "$enable_libwebpdemux" = "yes"; then
7	- build_vwebp=yes
8	else
9	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Not building vwebp. OpenGL libraries and --enable-libwebpdemux are required." >&5
10	printf "%s\n" "$as_me: Not building vwebp. OpenGL libraries and --enable-libwebpdemux are required." >&6;}

Added Link Here

(-)b/graphics/webp/files/patch-examples_vwebp.c (+11 lines)
1	--- examples/vwebp.c.orig 2023-09-13 22:11:07 UTC
2	+++ examples/vwebp.c
3	@@ -27,7 +27,7 @@
4	#if defined(HAVE_GLUT_GLUT_H)
5	#include <GLUT/glut.h>
6	#else
7	-#include <GL/glut.h>
8	+#include <GL/freeglut.h>
9	#ifdef FREEGLUT
10	#include <GL/freeglut.h>
11	#endif




include/webp/sharpyuv/sharpyuv.h
include/webp/sharpyuv/sharpyuv_csp.h
include/webp/types.h
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.8
lib/libwebpdecoder.a
lib/libwebpdecoder.so
lib/libwebpdecoder.so.3
lib/libwebpdecoder.so.3.1.8
lib/libwebpdemux.a
lib/libwebpdemux.so
lib/libwebpdemux.so.2
lib/libwebpdemux.so.2.0.14
lib/libwebpmux.a
lib/libwebpmux.so
lib/libwebpmux.so.3
lib/libwebpmux.so.3.0.13
libdata/pkgconfig/libsharpyuv.pc
libdata/pkgconfig/libwebp.pc
libdata/pkgconfig/libwebpdecoder.pc

Return to bug 273766

Lines 1-10 Link Here

(-)b/graphics/webp/Makefile (-19 / +16 lines)
1	PORTNAME= webp	1	PORTNAME= webp
2	PORTVERSION= 1.3.1	2	DISTVERSION= 1.3.2
3	PORTREVISION= 1
4	CATEGORIES= graphics	3	CATEGORIES= graphics
5	MASTER_SITES= http://downloads.webmproject.org/releases/webp/ \	4	MASTER_SITES= http://downloads.webmproject.org/releases/${PORTNAME}/ \
6	https://storage.googleapis.com/downloads.webmproject.org/releases/webp/	5	https://storage.googleapis.com/downloads.webmproject.org/releases/${PORTNAME}/
7	DISTNAME= libwebp-${PORTVERSION}	6	DISTNAME= lib${PORTNAME}-${DISTVERSION}
8		7
9	MAINTAINER= sunpoet@FreeBSD.org	8	MAINTAINER= sunpoet@FreeBSD.org
10	COMMENT= Google WebP image format conversion tool	9	COMMENT= Google WebP image format conversion tool
Lines 13-44 WWW= https://developers.google.com/speed/webp Link Here
13	LICENSE= BSD3CLAUSE	12	LICENSE= BSD3CLAUSE
14	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
15		14
16	USES= compiler:c11 libtool localbase	15	USES= cmake compiler:c11 pathfix
17
18	CONFIGURE_ARGS= --enable-libwebpdecoder \
19	--enable-libwebpdemux \
20	--enable-libwebpmux \
21	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
22	GNU_CONFIGURE= yes
23	INSTALL_TARGET= install-strip
24	USE_LDCONFIG= yes	16	USE_LDCONFIG= yes
25		17
26	PORTSCOUT= limit:^[0-9\.]*$$	18	PORTSCOUT= limit:^[0-9\.]*$$
27		19
		20	CMAKE_ON= BUILD_SHARED_LIBS
		21	CMAKE_ARGS= -DCMAKE_DISABLE_FIND_PACKAGE_SDL:BOOL=True \
		22	-DCMAKE_INSTALL_MANDIR=man
		23
28	OPTIONS_DEFINE= IMGCONV X11	24	OPTIONS_DEFINE= IMGCONV X11
29	OPTIONS_DEFAULT=IMGCONV	25	OPTIONS_DEFAULT=IMGCONV
30	OPTIONS_SUB= yes	26	OPTIONS_SUB= yes
		27
31	IMGCONV_DESC= Install converters to/from WebP	28	IMGCONV_DESC= Install converters to/from WebP
32		29
33	IMGCONV_CONFIGURE_OFF= build_cwebp=no build_dwebp=no build_gif2webp=no build_img2webp=no
34	IMGCONV_CONFIGURE_ON= build_cwebp=yes build_dwebp=yes build_gif2webp=yes build_img2webp=yes
35	IMGCONV_LIB_DEPENDS= libgif.so:graphics/giflib \	30	IMGCONV_LIB_DEPENDS= libgif.so:graphics/giflib \
36	libpng.so:graphics/png \	31	libpng.so:graphics/png \
37	libtiff.so:graphics/tiff	32	libtiff.so:graphics/tiff
38	IMGCONV_USES= jpeg	33	IMGCONV_USES= jpeg
39	X11_CONFIGURE_OFF= build_vwebp=no	34	IMGCONV_CMAKE_BOOL= WEBP_BUILD_CWEBP WEBP_BUILD_DWEBP \
40	X11_CONFIGURE_ON= build_vwebp=yes	35	WEBP_BUILD_GIF2WEBP WEBP_BUILD_IMG2WEBP
41	X11_USE= GL=glut	36
42	X11_USES= gl	37	X11_USES= gl localbase:ldflags
		38	X11_USE= GL=glu,glut,opengl
		39	X11_CMAKE_BOOL= WEBP_BUILD_VWEBP
43		40
44	.include <bsd.port.mk>	41	.include <bsd.port.mk>

Added Link Here

(-)b/graphics/webp/files/patch-CMakeLists.txt (+48 lines)
1	--- CMakeLists.txt.orig 2023-09-14 19:07:05 UTC
2	+++ CMakeLists.txt
3	@@ -112,11 +112,11 @@ endif()
4	include(cmake/deps.cmake)
5	include(GNUInstallDirs)
6
7	-if(BUILD_SHARED_LIBS AND NOT DEFINED CMAKE_INSTALL_RPATH)
8	- # Set the rpath to match autoconf/libtool behavior. Note this must be set
9	- # before target creation.
10	- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
11	-endif()
12	+# if(BUILD_SHARED_LIBS AND NOT DEFINED CMAKE_INSTALL_RPATH)
13	+# # Set the rpath to match autoconf/libtool behavior. Note this must be set
14	+# # before target creation.
15	+# set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
16	+# endif()
17
18	# ##############################################################################
19	# Options.
20	@@ -564,8 +564,8 @@ endif()
21
22	if(WEBP_BUILD_VWEBP)
23	# vwebp
24	- find_package(GLUT)
25	- if(GLUT_FOUND)
26	+ find_package(FreeGLUT)
27	+ if(FreeGLUT_FOUND)
28	include_directories(${WEBP_DEP_IMG_INCLUDE_DIRS})
29	parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "VWEBP_SRCS" "vwebp")
30	add_executable(vwebp ${VWEBP_SRCS})
31	@@ -573,7 +573,7 @@ if(WEBP_BUILD_VWEBP)
32	vwebp
33	${OPENGL_LIBRARIES}
34	exampleutil
35	- GLUT::GLUT
36	+ glut
37	imageioutil
38	webp
39	webpdemux)
40	@@ -735,7 +735,7 @@ install(
41	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
42	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
43	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
44	-set(ConfigPackageLocation ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake/)
45	+set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/)
46	install(EXPORT ${PROJECT_NAME}Targets NAMESPACE ${PROJECT_NAME}::
47	DESTINATION ${ConfigPackageLocation})
48

Lines 13-38 include/webp/mux_types.h Link Here

(-)b/graphics/webp/pkg-plist (-9 / +8 lines)
13	include/webp/sharpyuv/sharpyuv.h	13	include/webp/sharpyuv/sharpyuv.h
14	include/webp/sharpyuv/sharpyuv_csp.h	14	include/webp/sharpyuv/sharpyuv_csp.h
15	include/webp/types.h	15	include/webp/types.h
16	lib/libsharpyuv.a	16	lib/cmake/WebP/WebPConfig.cmake
		17	lib/cmake/WebP/WebPConfigVersion.cmake
		18	lib/cmake/WebP/WebPTargets-%%CMAKE_BUILD_TYPE%%.cmake
		19	lib/cmake/WebP/WebPTargets.cmake
17	lib/libsharpyuv.so	20	lib/libsharpyuv.so
18	lib/libsharpyuv.so.0	21	lib/libsharpyuv.so.0
19	lib/libsharpyuv.so.0.0.1	22	lib/libsharpyuv.so.0.0.1
20	lib/libwebp.a
21	lib/libwebp.so	23	lib/libwebp.so
22	lib/libwebp.so.7	24	lib/libwebp.so.7
23	lib/libwebp.so.7.1.7	25	lib/libwebp.so.7.1.8
24	lib/libwebpdecoder.a
25	lib/libwebpdecoder.so	26	lib/libwebpdecoder.so
26	lib/libwebpdecoder.so.3	27	lib/libwebpdecoder.so.3
27	lib/libwebpdecoder.so.3.1.7	28	lib/libwebpdecoder.so.3.1.8
28	lib/libwebpdemux.a
29	lib/libwebpdemux.so	29	lib/libwebpdemux.so
30	lib/libwebpdemux.so.2	30	lib/libwebpdemux.so.2
31	lib/libwebpdemux.so.2.0.13	31	lib/libwebpdemux.so.2.0.14
32	lib/libwebpmux.a
33	lib/libwebpmux.so	32	lib/libwebpmux.so
34	lib/libwebpmux.so.3	33	lib/libwebpmux.so.3
35	lib/libwebpmux.so.3.0.12	34	lib/libwebpmux.so.3.0.13
36	libdata/pkgconfig/libsharpyuv.pc	35	libdata/pkgconfig/libsharpyuv.pc
37	libdata/pkgconfig/libwebp.pc	36	libdata/pkgconfig/libwebp.pc
38	libdata/pkgconfig/libwebpdecoder.pc	37	libdata/pkgconfig/libwebpdecoder.pc