Rebuild for new freeglut.
This commit is contained in:
parent
5a8e071e90
commit
0f707cf412
38
libwebp-freeglut.patch
Normal file
38
libwebp-freeglut.patch
Normal file
@ -0,0 +1,38 @@
|
||||
--- a/CMakeLists.txt~ 2019-07-04 14:32:37.000000000 -0500
|
||||
+++ a/CMakeLists.txt 2019-09-20 15:18:10.590042650 -0500
|
||||
@@ -458,20 +458,20 @@
|
||||
|
||||
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})
|
||||
target_link_libraries(vwebp
|
||||
${OPENGL_LIBRARIES}
|
||||
exampleutil
|
||||
- GLUT::GLUT
|
||||
+ -lglut
|
||||
imageioutil
|
||||
webp
|
||||
webpdemux)
|
||||
target_include_directories(vwebp
|
||||
- PRIVATE GLUT::GLUT
|
||||
+ PRIVATE -lglut
|
||||
${CMAKE_CURRENT_BINARY_DIR}/src
|
||||
${OPENGL_INCLUDE_DIR})
|
||||
install(TARGETS vwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
--- a/examples/vwebp.c~ 2019-07-04 14:32:37.000000000 -0500
|
||||
+++ a/examples/vwebp.c 2019-09-20 15:38:32.276641491 -0500
|
||||
@@ -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
|
@ -2,13 +2,14 @@
|
||||
|
||||
Name: libwebp
|
||||
Version: 1.0.3
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
URL: http://webmproject.org/
|
||||
Summary: Library and tools for the WebP graphics format
|
||||
# Additional IPR is licensed as well. See PATENTS file for details
|
||||
License: BSD
|
||||
Source0: http://downloads.webmproject.org/releases/webp/%{name}-%{version}.tar.gz
|
||||
Source1: libwebp_jni_example.java
|
||||
Patch0: libwebp-freeglut.patch
|
||||
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libpng-devel
|
||||
@ -76,6 +77,7 @@ export CFLAGS="%{optflags} -frename-registers"
|
||||
--enable-libwebpdemux --enable-libwebpdecoder \
|
||||
--disable-neon
|
||||
%make_build V=1
|
||||
make -C examples vwebp
|
||||
|
||||
# swig generated Java bindings
|
||||
cp %{SOURCE1} .
|
||||
@ -101,6 +103,7 @@ jar cvf ../libwebp.jar com/google/webp/*.class
|
||||
|
||||
%install
|
||||
%make_install
|
||||
install -m 755 examples/vwebp %{buildroot}%{_bindir}/vwebp
|
||||
find "%{buildroot}/%{_libdir}" -type f -name "*.la" -delete
|
||||
|
||||
# swig generated Java bindings
|
||||
@ -140,6 +143,9 @@ cp swig/*.jar swig/*.so %{buildroot}/%{_libdir}/%{name}-java/
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Sep 17 2019 Gwyn Ciesla <gwync@protonmail.com> - 1.0.3-3
|
||||
- Rebuilt for new freeglut
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user