openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File suse.patch of Package luxrender (Revision db61407a719aaaba132b681e3eb52972)

Currently displaying revision db61407a719aaaba132b681e3eb52972 , Show latest

diff -upr lux-9206b3ba7011/CMakeLists.txt lux-0.7.1//CMakeLists.txt
--- lux-9206b3ba7011/CMakeLists.txt	2010-10-14 21:18:39.000000000 +0200
+++ lux-0.7.1//CMakeLists.txt	2011-01-31 21:03:31.212793052 +0100
@@ -282,7 +282,7 @@ IF(APPLE)
 	ADD_DEFINITIONS(-O3 -ftree-vectorize -msse -msse2 -msse3 -mssse3 -fvariable-expansion-in-unroller -fpic -Wall -DHAVE_PTHREAD_H )
 ELSE(APPLE)
 	# Dade - default compiler options
-	ADD_DEFINITIONS(-O3 -msse2 -mfpmath=sse -ftree-vectorize -funroll-loops -Wall -fPIC -DHAVE_PTHREAD_H)
+	ADD_DEFINITIONS(-O3 -msse2 -mfpmath=sse -ftree-vectorize -fpermissive -funroll-loops -Wall -fPIC -DHAVE_PTHREAD_H)
 	# The QBVH accelerator needs to be compiled with much reduced optimizations
 	# otherwise gcc produces incorrect code and ruins the render on 64bits machines
 	SET_SOURCE_FILES_PROPERTIES(accelerators/qbvhaccel.cpp COMPILE_FLAGS "-O1")
diff -upr lux-9206b3ba7011/core/external/cimg.h lux-0.7.1//core/external/cimg.h
--- lux-9206b3ba7011/core/external/cimg.h	2010-10-14 21:18:39.000000000 +0200
+++ lux-0.7.1//core/external/cimg.h	2011-01-31 21:03:31.340790770 +0100
@@ -25679,6 +25679,9 @@ namespace cimg_library {
       png_read_info(png_ptr,info_ptr);
       png_uint_32 W, H;
       int bit_depth, color_type, interlace_type;
+      #ifndef int_p_NULL
+      #define int_p_NULL (int*)NULL
+      #endif
       png_get_IHDR(png_ptr,info_ptr,&W,&H,&bit_depth,&color_type,&interlace_type,int_p_NULL,int_p_NULL);
       int new_bit_depth = bit_depth;
       int new_color_type = color_type;
diff -upr lux-9206b3ba7011/qtgui/luxrender.ui lux-0.7.1//qtgui/luxrender.ui
--- lux-9206b3ba7011/qtgui/luxrender.ui	2010-10-14 21:18:39.000000000 +0200
+++ lux-0.7.1//qtgui/luxrender.ui	2011-01-31 21:04:46.712793872 +0100
@@ -713,9 +713,6 @@
      <height>22</height>
     </rect>
    </property>
-   <property name="nativeMenuBar">
-    <bool>true</bool>
-   </property>
    <widget class="QMenu" name="menu_render">
     <property name="title">
      <string>Render</string>
Nur in lux-0.7.1//qtgui: luxrender.ui~.
diff -upr lux-9206b3ba7011/renderer/luxrender.desktop lux-0.7.1//renderer/luxrender.desktop
--- lux-9206b3ba7011/renderer/luxrender.desktop	2010-10-14 21:18:39.000000000 +0200
+++ lux-0.7.1//renderer/luxrender.desktop	2011-01-31 21:03:31.341792259 +0100
@@ -1,9 +1,10 @@
 [Desktop Entry]
+X-SuSE-translate=false
 Name=Lux
 GenericName=Lux Renderer
 Comment=LuxRender unbiased rendering system
 Exec=luxrender
-Icon=/usr/share/pixmaps/luxrender.svg
+Icon=luxrender
 Terminal=false
 Type=Application
 Categories=Application;Graphics;3DGraphics

Places

File suse.patch of Package luxrender (Revision db61407a719aaaba132b681e3eb52972)

Places