update(dependencies): Update SDL2_image to 2.0.3

+ end hotfix madness; unfork recipe
+ macOS support fixed (#385)

cmake/require_thirdparty_libs.cmake

@@ -149,7 +149,7 @@ add_require_conan_lib_function(CEF)
 add_require_conan_lib_function(sdl2)
 
 # sdl2_image (image loader library)
-add_require_conan_lib_function(sdl2_image_lowercase)
+add_require_conan_lib_function(sdl2_image)
 
 # libjpeg turbo a dependency of sdl2_image
 add_require_conan_lib_function(libjpeg-turbo)
@@ -167,7 +167,7 @@ function(require_sdl targ)
   require_sdl2(${targ})
   require_libjpeg_turbo(${targ})
   require_libpng(${targ})
-  require_sdl2_image_lowercase(${targ})
+  require_sdl2_image(${targ})
   # require_sdl2_mixer(${targ})
   require_opengl(${targ})
 endfunction()

conanfile.py

@@ -16,7 +16,7 @@ class InexorConan(ConanFile):
     def configure(self):
         if self.settings.compiler == "gcc":
             self.options["sdl2"].shared = True
-            self.options["sdl2_image_lowercase"].shared = True
+            self.options["sdl2_image"].shared = True
 
     def build(self):
         args = []

dependencies.py

@@ -9,9 +9,7 @@
     ("ENet/1.3.13@inexorgame/stable"),
     ("spdlog/0.17.0@bincrafters/stable"),
     ("sdl2/2.0.8@bincrafters/testing"),  # not self-contained
-    ("sdl2_image_lowercase/2.0.1@inexorgame/stable"),  # todo: unfork
-        ("libpng/1.6.34@bincrafters/stable"),  # override for Conan >= 0.30.0 compatibility
-        ("libjpeg-turbo/1.5.2@bincrafters/stable"),  # override for Conan >= 0.30.0 compatibility
+    ("sdl2_image/2.0.3@bincrafters/stable"),
     ("CEF/3.3239.1709.g093cae4@inexorgame/testing")  # not self-contained
 )
 
@@ -22,7 +20,7 @@
   ENet:shared=False
   Boost:shared=False
   sdl2:shared=False
-  sdl2_image_lowercase:shared=False
+  sdl2_image:shared=False
   spdlog:fmt_external=True
   protobuf:with_zlib=True
 '''

tool/travis_macos.sh

@@ -59,8 +59,12 @@ build() {
 
     conan user -p "${CONAN_PASSWORD}" -r inexor "${CONAN_USER}"
 
-    rebuild_conan_and_upload "spdlog/0.17.0@bincrafters/stable"
-    rebuild_conan_and_upload "fmt/4.1.0@bincrafters/stable"
+    rebuild_conan_and_upload "sdl2/2.0.8@bincrafters/testing"
+    build_conan_and_upload "libpng/1.6.34@bincrafters/stable"
+    build_conan_and_upload "libjpeg-turbo/1.5.2@bincrafters/stable"
+    rebuild_conan_and_upload "sdl2_image/2.0.3@bincrafters/stable"
+    build_conan_and_upload "spdlog/0.17.0@bincrafters/stable"
+    build_conan_and_upload "fmt/4.1.0@bincrafters/stable"
     build_conan_and_upload "doxygen/1.8.13@inexorgame/stable"
     build_conan_and_upload "kainjow-mustache/3.1@inexorgame/stable"
     build_conan_and_upload "bzip2/1.0.6@conan/stable"
@@ -70,15 +74,13 @@ build() {
     build_conan_and_upload "ENet/1.3.13@inexorgame/stable"
     build_conan_and_upload "protobuf/3.5.1@bincrafters/stable"
     build_conan_and_upload "gRPC/1.8.3@inexorgame/stable"
-    build_conan_and_upload "libpng/1.6.34@bincrafters/stable"
+
     build_conan_and_upload "Boost/1.66.0@conan/stable"
 
     build_conan_and_upload "InexorGlueGen/0.6.8@inexorgame/stable"
 
-    build_conan_and_upload "libjpeg-turbo/1.5.2@bincrafters/stable"
     rebuild_conan_and_upload "OpenSSL/1.1.0g@conan/stable"
-    rebuild_conan "sdl2/2.0.8@bincrafters/testing"
-    rebuild_conan "sdl2_image_lowercase/2.0.1@inexorgame/stable"
+
 
     build_conan "doxygen/1.8.14@inexorgame/stable"
     build_conan "CEF/3.3239.1709.g093cae4@inexorgame/testing"