disable gltf on rhel

f41
David Tardon 10 years ago
parent e50400d4db
commit 268ab33bb8

@ -108,12 +108,13 @@ Source35: %{external_url}/libetonyek-0.1.1.tar.bz2
Source36: %{external_url}/libfreehand-0.1.0.tar.bz2 Source36: %{external_url}/libfreehand-0.1.0.tar.bz2
Source37: %{external_url}/libabw-0.1.1.tar.bz2 Source37: %{external_url}/libabw-0.1.1.tar.bz2
Source38: %{external_url}/librevenge-0.0.2.tar.bz2 Source38: %{external_url}/librevenge-0.0.2.tar.bz2
Source39: %{external_url}/libgltf/libgltf-0.0.2.tar.bz2 Source39: %{external_url}/libpagemaker-0.0.2.tar.bz2
Source40: %{external_url}/OpenCOLLADA-master-6509aa13af.tar.bz2 %global bundling_options %{?bundling_options} --without-system-libcmis --without-system-libcdr --without-system-libwpg --without-system-libwpd --without-system-libwps --without-system-libvisio --without-system-libmspub --without-system-libodfgen --without-system-libmwaw --without-system-libetonyek --without-system-libfreehand --without-system-libabw --without-system-librevenge --without-system-libpagemaker
Source41: %{external_url}/libpagemaker-0.0.2.tar.bz2 %endif
%global bundling_options %{?bundling_options} --without-system-libcmis --without-system-libcdr --without-system-libwpg --without-system-libwpd --without-system-libwps --without-system-libvisio --without-system-libmspub --without-system-libodfgen --without-system-libmwaw --without-system-libetonyek --without-system-libfreehand --without-system-libabw --without-system-librevenge --without-system-libgltf --without-system-opencollada --without-system-libpagemaker
%if 0%{?fedora}
Source40: %{external_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
%endif %endif
Source42: %{external_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
# build tools # build tools
BuildRequires: autoconf BuildRequires: autoconf
@ -1210,16 +1211,16 @@ export CXXFLAGS=$ARCH_FLAGS
%if 0%{?rhel} %if 0%{?rhel}
%if 0%{?rhel} < 7 %if 0%{?rhel} < 7
# make segfaults on parallel build # make segfaults on parallel build
%define distrooptions --disable-eot --disable-firebird-sdbc --disable-graphite --without-junit --enable-gstreamer-0-10 --disable-gstreamer-1-0 --disable-postgresql-sdbc --enable-python=system --with-system-hsqldb --without-doxygen --with-parallelism=-j1 %define distrooptions --disable-eot --disable-gltf --disable-firebird-sdbc --disable-graphite --without-junit --enable-gstreamer-0-10 --disable-gstreamer-1-0 --disable-postgresql-sdbc --enable-python=system --with-system-hsqldb --without-doxygen --with-parallelism=-j1
%ifarch s390 s390x %ifarch s390 s390x
%define archoptions --disable-sdremote-bluetooth %define archoptions --disable-sdremote-bluetooth
%endif %endif
%else # rhel7 %else # rhel7
%define distrooptions --disable-eot --disable-firebird-sdbc --disable-gstreamer-0-10 --enable-gstreamer-1-0 --with-system-mythes --enable-python=system %{?_smp_mflags:--with-parallelism=%{_smp_mflags}} %define distrooptions --disable-eot --disable-gltf --disable-firebird-sdbc --disable-gstreamer-0-10 --enable-gstreamer-1-0 --with-system-mythes --enable-python=system %{?_smp_mflags:--with-parallelism=%{_smp_mflags}}
%endif %endif
%else # fedora %else # fedora
%define distrooptions --enable-eot --enable-gtk3 --enable-kde4 --disable-gstreamer-0-10 --enable-gstreamer-1-0 --with-system-mythes %{?_smp_mflags:--with-parallelism=%{_smp_mflags}} %define distrooptions --enable-eot --enable-gtk3 --enable-kde4 --disable-gstreamer-0-10 --enable-gstreamer-1-0 --with-system-mythes --with-system-opencollada %{?_smp_mflags:--with-parallelism=%{_smp_mflags}}
export OPENCOLLADA_CFLAGS='-I/usr/include/COLLADABaseUtils -I/usr/include/COLLADAFramework -I/usr/include/COLLADASaxFrameworkLoader -I/usr/include/GeneratedSaxParser' export OPENCOLLADA_CFLAGS='-I/usr/include/COLLADABaseUtils -I/usr/include/COLLADAFramework -I/usr/include/COLLADASaxFrameworkLoader -I/usr/include/GeneratedSaxParser'
export OPENCOLLADA_LIBS='-lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser' export OPENCOLLADA_LIBS='-lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser'
%endif %endif
@ -1266,9 +1267,7 @@ touch autogen.lastrun
--with-external-tar="$EXTSRCDIR" \ --with-external-tar="$EXTSRCDIR" \
--with-help \ --with-help \
--with-system-dicts \ --with-system-dicts \
--with-system-libgltf \
--with-system-libs \ --with-system-libs \
--with-system-opencollada \
--with-system-ucpp \ --with-system-ucpp \
--without-fonts \ --without-fonts \
--without-system-npapi-headers \ --without-system-npapi-headers \

Loading…
Cancel
Save