3 files changed, 19 insertions, 45 deletions

diff --git a/games/supertuxkart/files/patch-cmake-FindFribidi.cmake b/games/supertuxkart/files/patch-cmake-FindFribidi.cmake
new file mode 100644
index 000000000000..46b2cbaf9122
--- /dev/null
+++ b/games/supertuxkart/files/patch-cmake-FindFribidi.cmake
@@ -0,0 +1,19 @@
+--- cmake/FindFribidi.cmake.orig	2013-03-13 08:03:26.000000000 +0400
++++ cmake/FindFribidi.cmake	2013-11-28 09:33:04.134268507 +0400
+@@ -18,7 +18,15 @@
+     set(FRIBIDI_FOUND 1)
+ elseif(UNIX)
+     include(FindPkgConfig)
+-    pkg_check_modules(FRIBIDI fribidi)
++    pkg_check_modules(PC_FRIBIDI fribidi)
++    find_path(FRIBIDI_INCLUDE_DIR NAMES fribidi/fribidi.h HINTS ${PC_FRIBIDI_INCLUDE_DIRS})
++    find_library(FRIBIDI_LIBRARY NAMES fribidi HINTS ${PC_FRIBIDI_LIBRARY_DIRS})
++
++    include(FindPackageHandleStandardArgs)
++    find_package_handle_standard_args(Fribidi DEFAULT_MSG FRIBIDI_INCLUDE_DIR FRIBIDI_LIBRARY)
++
++    set(FRIBIDI_INCLUDE_DIRS ${FRIBIDI_INCLUDE_DIR})
++    set(FRIBIDI_LIBRARIES ${FRIBIDI_LIBRARY})
+ else()
+     set(FRIBIDI_FOUND 0)
+ endif()
diff --git a/games/supertuxkart/files/patch-lib-irrlicht-source-Irrlicht-Makefile b/games/supertuxkart/files/patch-lib-irrlicht-source-Irrlicht-Makefile
deleted file mode 100644
index 44820f01edf0..000000000000
--- a/games/supertuxkart/files/patch-lib-irrlicht-source-Irrlicht-Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
---- lib/irrlicht/source/Irrlicht/Makefile.orig	2012-11-02 05:34:43.000000000 +0400
-+++ lib/irrlicht/source/Irrlicht/Makefile	2012-12-24 23:41:14.396517819 +0400
-@@ -56,12 +56,11 @@
- EXTRAOBJ =
- LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
- 	$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
--	$(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \
--	$(BZIP2OBJ) $(EXTRAOBJ)
-+	$(IRRGUIOBJ) $(LIBAESGM) $(BZIP2OBJ) $(EXTRAOBJ)
- 
- ###############
- #Compiler flags
--CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
-+CXXINCS = -I../../include -I${LOCALBASE}/include
- CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
- CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
- ifndef NDEBUG
-@@ -72,7 +71,7 @@
- ifdef PROFILE
- CXXFLAGS += -pg
- endif
--CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
-+CFLAGS += -O3 -fexpensive-optimizations
- 
- sharedlib sharedlib_osx: CXXFLAGS += -fPIC
- sharedlib sharedlib_osx: CFLAGS += -fPIC
-@@ -89,7 +88,7 @@
- INSTALL_DIR = /usr/local/lib
- sharedlib install: SHARED_LIB = libIrrlicht.so
- sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
--staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
-+staticlib sharedlib: CXXINCS += -I${LOCALBASE}/include
- 
- #OSX specific options
- staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX
diff --git a/games/supertuxkart/files/patch-src-utils-random__generator.hpp b/games/supertuxkart/files/patch-src-utils-random__generator.hpp
deleted file mode 100644
index 309fc9fee2a3..000000000000
--- a/games/supertuxkart/files/patch-src-utils-random__generator.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/utils/random_generator.hpp.orig	2011-12-06 22:43:36.000000000 +0400
-+++ src/utils/random_generator.hpp	2013-09-13 21:51:20.971227530 +0400
-@@ -21,6 +21,7 @@
- 
- #include <algorithm>
- #include <vector>
-+#include <cstdlib> // for rand()
- 
- /** A random number generator. Each objects that needs a random number uses
-     its own number random generator. They are all seeded with number provided