X-Git-Url: http://git.pld-linux.org/?p=packages%2Fmupdf.git;a=blobdiff_plain;f=mupdf.spec;h=2fab022e0d12c1fe39b93995f8bf265645e25b4e;hp=1e4c62bf81f9271de534b3bc2ea57166ad71229e;hb=1796b0e;hpb=973c4d4ab1402805d5728efe15778f15609c31bc

diff --git a/mupdf.spec b/mupdf.spec
index 1e4c62b..2fab022 100644
--- a/mupdf.spec
+++ b/mupdf.spec
@@ -1,48 +1,54 @@
 Summary:	MuPDF - lightweight PDF, XPS and CBZ viewer and parser/rendering library
-Summary(pl.UTF-8):	MuPDF - lekka przeglądarka oraz biblioteka renderująca PDF, XPS, CBZ
+Summary(pl.UTF-8):	MuPDF - lekka przeglądarka PDF, XPS, CBZ
 Name:		mupdf
-Version:	1.3
+Version:	1.18.0
 Release:	1
 License:	AGPL v3+
 Group:		Applications/Text
-#Source0Download: http://code.google.com/p/mupdf/downloads/list?q=source
-Source0:	http://mupdf.googlecode.com/files/%{name}-%{version}-source.tar.gz
-# Source0-md5:	fe53c2a56ebd7759f5f965bc4ff66359
-Patch0:		%{name}-openjpeg.patch
-Patch1:		%{name}-curl.patch
-Patch2:		%{name}-v8.patch
-Patch3:		%{name}-shared.patch
-URL:		http://www.mupdf.com/
-BuildRequires:	curl-devel
-BuildRequires:	freetype-devel >= 2
-BuildRequires:	jbig2dec-devel
+Source0:	https://www.mupdf.com/downloads/archive/%{name}-%{version}-source.tar.gz
+# Source0-md5:	6f42be1365350f05270f8776517a3872
+URL:		https://www.mupdf.com/
+BuildRequires:	OpenGL-glut-devel
+BuildRequires:	curl-devel >= 7.66.0
+BuildRequires:	freetype-devel >= 1:2.10.0
+BuildRequires:	gumbo-parser-devel >= 0.10.1
+BuildRequires:	harfbuzz-devel >= 2.8.0
+BuildRequires:	jbig2dec-devel >= 0.18
 BuildRequires:	libjpeg-devel
 BuildRequires:	libstdc++-devel
-BuildRequires:	openjpeg2-devel >= 2
-BuildRequires:	openssl-devel
+BuildRequires:	libtool
+BuildRequires:	mujs-devel >= 1.0.9
+BuildRequires:	openjpeg2-devel >= 2.3.1
+BuildRequires:	openssl-devel >= 1.1.0
 BuildRequires:	pkgconfig
-BuildRequires:	v8-devel
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXext-devel
-BuildRequires:	zlib-devel
-Requires:	%{name}-libs = %{version}-%{release}
+BuildRequires:	zlib-devel >= 1.2.11
+Requires:	curl-libs >= 7.66.0
+Requires:	freetype >= 1:2.10.0
+Requires:	gumbo-parser >= 0.10.1
+Requires:	harfbuzz >= 2.8.0
+Requires:	jbig2dec >= 0.18
+Requires:	openjpeg2 >= 2.3.1
+Requires:	zlib >= 1.2.11
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# needs symbols from one of libmupdf-js-*
-%define		skip_post_check_so	libmupdf.so.*
-
 %description
-MuPDF is a lightweight PDF, XPS and CBZ viewer and parser/rendering
-library.
+MuPDF is a lightweight PDF, XPS and CBZ viewer.
 
 %description -l pl.UTF-8
-MuPDF to lekka przeglądarka oraz biblioteka analizująca/renderująca
-pliki PDF, XPS i CBZ.
+MuPDF to lekka przeglądarka pliki PDF, XPS i CBZ.
 
 %package libs
 Summary:	Shared MuPDF libraries
 Summary(pl.UTF-8):	Biblioteki współdzielone MuPDF
 Group:		Libraries
+Requires:	freetype >= 1:2.10.0
+Requires:	jbig2dec >= 0.18
+Requires:	mujs >= 1.0.9
+Requires:	openjpeg2
+Requires:	openssl >= 1.1.0
+Requires:	zlib >= 1.2.11
 
 %description libs
 Shared MuPDF libraries.
@@ -55,14 +61,14 @@ Summary:	Header files for MuPDF libraries
 Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek MuPDF
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	freetype-devel >= 2
-Requires:	jbig2dec-devel
+Requires:	freetype-devel >= 1:2.10.0
+Requires:	jbig2dec-devel >= 0.18
 Requires:	libjpeg-devel
 Requires:	libstdc++-devel
-Requires:	openjpeg2-devel >= 2
-Requires:	openssl-devel
-Requires:	v8-devel
-Requires:	zlib-devel
+Requires:	mujs-devel >= 1.0.9
+Requires:	openjpeg2-devel >= 2.3.1
+Requires:	openssl-devel >= 1.1.0
+Requires:	zlib-devel >= 1.2.11
 
 %description devel
 Header files for MuPDF libraries.
@@ -84,35 +90,65 @@ Statyczne biblioteki MuPDF.
 
 %prep
 %setup -q -n %{name}-%{version}-source
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
-# use system libs instead
-%{__rm} -r thirdparty/{curl,freetype,jbig2dec,jpeg,openjpeg,zlib}
+# use system libs instead:
+# curl 7.66.0
+# freetype 2.10.0
+# harfbuzz 2.6.4 + git update (nothing crucial)
+# jbig2dec 0.18
+# libjpeg 9
+# mujs ?
+# openjpeg 2.3.1
+# zlib 1.2.11
+%{__rm} -r thirdparty/{curl,freetype,gumbo-parser,harfbuzz,jbig2dec,libjpeg,mujs,openjpeg,zlib}
+# but keep:
+# freeglut - 3.0.0 + some additional keyboard and clipboard APIs
+# lcms2 - "art" fork with tread safety
 
 %build
 CFLAGS="%{rpmcflags} %{rpmcppflags}" \
 LDFLAGS="%{rpmldflags}" \
-%{__make} \
+%{__make} -j1 \
+	CC="%{__cc}" \
+	CXX="%{__cxx}" \
+	SYS_OPENJPEG_CFLAGS="$(pkg-config --cflags libopenjp2)" \
+	USE_SYSTEM_LIBS=yes \
+	USE_SYSTEM_MUJS=yes \
+	build=release \
+	libdir=%{_libdir} \
+	verbose=yes
+
+%{__make} -j1 \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
-	V8_PRESENT=yes \
+	SYS_OPENJPEG_CFLAGS="$(pkg-config --cflags libopenjp2)" \
+	USE_SYSTEM_LIBS=yes \
+	USE_SYSTEM_MUJS=yes \
 	build=release \
+	shared=yes \
 	libdir=%{_libdir} \
-	verbose=1
+	verbose=yes
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	V8_PRESENT=yes \
+	USE_SYSTEM_LIBS=yes \
+	USE_SYSTEM_MUJS=yes \
 	build=release \
 	prefix=%{_prefix} \
 	libdir=%{_libdir}
 
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT \
+	USE_SYSTEM_LIBS=yes \
+	USE_SYSTEM_MUJS=yes \
+	build=release \
+	shared=yes \
+	prefix=%{_prefix} \
+	libdir=%{_libdir}
+
 # packaged as %doc
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/mupdf
 
@@ -124,39 +160,24 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES CONTRIBUTORS README
-%attr(755,root,root) %{_bindir}/mudraw
-%attr(755,root,root) %{_bindir}/mujstest-v8
+%doc CHANGES CONTRIBUTORS README docs/{index,manual*,thirdparty}.html
+%attr(755,root,root) %{_bindir}/mupdf-gl
 %attr(755,root,root) %{_bindir}/mupdf-x11
 %attr(755,root,root) %{_bindir}/mupdf-x11-curl
-%attr(755,root,root) %{_bindir}/mupdf-x11-v8
+%attr(755,root,root) %{_bindir}/muraster
 %attr(755,root,root) %{_bindir}/mutool
-%{_mandir}/man1/mudraw.1*
 %{_mandir}/man1/mupdf.1*
 %{_mandir}/man1/mutool.1*
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libmupdf.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmupdf.so.0
-%attr(755,root,root) %{_libdir}/libmupdf-js-none.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmupdf-js-none.so.0
-%attr(755,root,root) %{_libdir}/libmupdf-js-v8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmupdf-js-v8.so.0
+%attr(755,root,root) %{_libdir}/libmupdf.so
 
 %files devel
 %defattr(644,root,root,755)
-%doc docs/{naming,overview,progressive,refcount,thirdparty}.txt
-%attr(755,root,root) %{_libdir}/libmupdf.so
-%attr(755,root,root) %{_libdir}/libmupdf-js-none.so
-%attr(755,root,root) %{_libdir}/libmupdf-js-v8.so
-%{_libdir}/libmupdf.la
-%{_libdir}/libmupdf-js-none.la
-%{_libdir}/libmupdf-js-v8.la
 %{_includedir}/mupdf
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libmupdf.a
-%{_libdir}/libmupdf-js-none.a
-%{_libdir}/libmupdf-js-v8.a
+%{_libdir}/libmupdf-third.a