From 41701f66ccaf31651c791a8b0b8c71dc5f7180a2 Mon Sep 17 00:00:00 2001 From: Jochen Schmitt Date: Aug 08 2015 08:42:26 +0000 Subject: Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 --- diff --git a/.gitignore b/.gitignore index 126154b..c8c14da 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ blender-2.49b-repack.tar.bz2 /blender-2.73.tar.gz /blender-2.73a.tar.gz /blender-2.74.tar.gz +/blender-2.75.tar.gz diff --git a/blender-2.74-reg.patch b/blender-2.74-reg.patch deleted file mode 100644 index 5200205..0000000 --- a/blender-2.74-reg.patch +++ /dev/null @@ -1,153 +0,0 @@ -diff --git a/intern/ghost/intern/GHOST_NDOFManagerX11.cpp b/intern/ghost/intern/GHOST_NDOFManagerX11.cpp -index de44b36..75e476c 100644 ---- a/intern/ghost/intern/GHOST_NDOFManagerX11.cpp -+++ b/intern/ghost/intern/GHOST_NDOFManagerX11.cpp -@@ -1,147 +1,147 @@ - /* - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * Contributor(s): - * Mike Erwin - * - * ***** END GPL LICENSE BLOCK ***** - */ - - #ifdef WITH_INPUT_NDOF - - #include "GHOST_NDOFManagerX11.h" - #include "GHOST_SystemX11.h" - #include - #include - - - GHOST_NDOFManagerX11::GHOST_NDOFManagerX11(GHOST_System& sys) - : GHOST_NDOFManager(sys), - m_available(false) - { - setDeadZone(0.1f); /* how to calibrate on Linux? throw away slight motion! */ - - if (spnav_open() != -1) { - m_available = true; - - /* determine exactly which device (if any) is plugged in */ - - #define MAX_LINE_LENGTH 100 - - /* look for USB devices with Logitech or 3Dconnexion's vendor ID */ -- FILE *command_output = popen("lsusb | grep '046d:\|256f:'", "r"); -+ FILE *command_output = popen("lsusb | grep '046d:\\|256f:'", "r"); - if (command_output) { - char line[MAX_LINE_LENGTH] = {0}; - while (fgets(line, MAX_LINE_LENGTH, command_output)) { - unsigned short vendor_id = 0, product_id = 0; - if (sscanf(line, "Bus %*d Device %*d: ID %hx:%hx", &vendor_id, &product_id) == 2) - if (setDevice(vendor_id, product_id)) { - break; /* stop looking once the first 3D mouse is found */ - } - } - pclose(command_output); - } - } - else { - #ifdef DEBUG - /* annoying for official builds, just adds noise and most people don't own these */ - puts("ndof: spacenavd not found"); - /* This isn't a hard error, just means the user doesn't have a 3D mouse. */ - #endif - } - } - - GHOST_NDOFManagerX11::~GHOST_NDOFManagerX11() - { - if (m_available) - spnav_close(); - } - - bool GHOST_NDOFManagerX11::available() - { - return m_available; - } - - /* - * Workaround for a problem where we don't enter the 'GHOST_kFinished' state, - * this causes any proceeding event to have a very high 'dt' (time delta), - * many seconds for eg, causing the view to jump. - * - * this workaround expects continuous events, if we miss a motion event, - * immediately send a dummy event with no motion to ensure the finished state is reached. - */ - #define USE_FINISH_GLITCH_WORKAROUND - /* TODO: make this available on all platforms */ - - #ifdef USE_FINISH_GLITCH_WORKAROUND - static bool motion_test_prev = false; - #endif - - bool GHOST_NDOFManagerX11::processEvents() - { - bool anyProcessed = false; - - if (m_available) { - spnav_event e; - - #ifdef USE_FINISH_GLITCH_WORKAROUND - bool motion_test = false; - #endif - - while (spnav_poll_event(&e)) { - switch (e.type) { - case SPNAV_EVENT_MOTION: - { - /* convert to blender view coords */ - GHOST_TUns64 now = m_system.getMilliSeconds(); - const short t[3] = {(short)e.motion.x, (short)e.motion.y, (short)-e.motion.z}; - const short r[3] = {(short)-e.motion.rx, (short)-e.motion.ry, (short)e.motion.rz}; - - updateTranslation(t, now); - updateRotation(r, now); - #ifdef USE_FINISH_GLITCH_WORKAROUND - motion_test = true; - #endif - break; - } - case SPNAV_EVENT_BUTTON: - GHOST_TUns64 now = m_system.getMilliSeconds(); - updateButton(e.button.bnum, e.button.press, now); - break; - } - anyProcessed = true; - } - - #ifdef USE_FINISH_GLITCH_WORKAROUND - if (motion_test_prev == true && motion_test == false) { - GHOST_TUns64 now = m_system.getMilliSeconds(); - const short v[3] = {0, 0, 0}; - - updateTranslation(v, now); - updateRotation(v, now); - - anyProcessed = true; - } - motion_test_prev = motion_test; - #endif - - } - - return anyProcessed; - } - - #endif /* WITH_INPUT_NDOF */ diff --git a/blender.spec b/blender.spec index 3e0c9e0..a9961ba 100644 --- a/blender.spec +++ b/blender.spec @@ -1,4 +1,4 @@ -%global blender_api 2.74 +%global blender_api 2.75 %global blender_fontdir %{_fontbasedir}/blender # [Fedora] Turn off the brp-python-bytecompile script @@ -22,7 +22,7 @@ Name: blender Epoch: 1 Version: %{blender_api} -Release: 5%{?dist} +Release: 4%{?dist} Summary: 3D modeling, animation, rendering and post-production @@ -39,9 +39,6 @@ Source10: macros.blender Patch2: blender-2.73-droid.patch -# Regression patch taken from upstream -Patch100: blender-2.74-reg.patch - BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: libtool @@ -90,7 +87,6 @@ BuildRequires: OpenColorIO-devel BuildRequires: libsamplerate-devel BuildRequires: libao-devel BuildRequires: libsndfile-devel -BuildRequires: esound-devel BuildRequires: freealut-devel BuildRequires: jack-audio-connection-kit-devel @@ -158,8 +154,6 @@ sets. %patch2 -p1 -b .droid -%patch100 -p1 - find -name '.svn' -print | xargs rm -rf %build @@ -263,6 +257,59 @@ mkdir -p ${RPM_BUILD_ROOT}/%{blender_fontdir}/ cp -p release/datafiles/fonts/*.ttf.gz \ ${RPM_BUILD_ROOT}%{blender_fontdir}/ +# Register as an application to be visible in the software center +# +# NOTE: It would be *awesome* if this file was maintained by the upstream +# project, translated and installed into the right place during `make install`. +# +# See http://www.freedesktop.org/software/appstream/docs/ for more details. +# +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata +cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml < + + + + blender.desktop + CC0-1.0 + +

+ Blender provides a broad spectrum of modeling, texturing, lighting, + animation and video post-processing functionality in one package. + Through its open architecture, Blender provides cross-platform + interoperability, extensibility, an incredibly small footprint, and a + tightly integrated workflow. + Blender is one of the most popular Open Source 3D graphics applications in + the world. +

+

+ Aimed at media professionals and artists world-wide, Blender can be used + to create 3D visualizations and still images, as well as broadcast- and + cinema-quality videos, while the incorporation of a real-time 3D engine + allows for the creation of 3D interactive content for stand-alone + playback. +

+ + http://www.blender.org/ + + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/blender/a.png + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/blender/b.png + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/blender/c.png + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/blender/d.png + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/blender/e.png + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/blender/f.png + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/blender/g.png + + + +EOF + %post /usr/bin/update-desktop-database &> /dev/null || : /bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null || : @@ -284,6 +331,7 @@ fi %files %defattr(-,root,root,-) %{_bindir}/blender +%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/blender.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.* %{_libdir}/blender/ @@ -308,6 +356,21 @@ fi %doc release/datafiles/LICENSE-bmonofont-i18n.ttf.txt %changelog +* Wed Jul 29 2015 Fedora Release Engineering - 1:2.75-4 +- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 + +* Thu Jul 23 2015 Peter Robinson 1:2.75-3 +- Drop esound dep + +* Wed Jul 22 2015 David Tardon - 1:2.75-2 +- rebuild for Boost 1.58 + +* Tue Jul 7 2015 Jochen Schmitt - 1:2.75-1 +- New upstream release + +* Wed Jun 17 2015 Fedora Release Engineering - 1:2.74-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 16 2015 Jochen Schmitt - 1:2.74-5 - Add dependency to numpy (#1222122I diff --git a/sources b/sources index 5c53f0d..fbf1f5f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -488151953d69d63bedd8ed59f92daf3b blender-2.74.tar.gz +21f1e7dc5f8e576ca4677ab77ebf8e63 blender-2.75.tar.gz