Merge pull request kivy#2678 from kived/build-sdl2

Build sdl2 by default

Author: akshayaurora

kivy/core/clipboard/__init__.py

@@ -120,10 +120,10 @@ def _paste(self):
     _clipboards.append(
         ('android', 'clipboard_android', 'ClipboardAndroid'))
 elif _platform in ('macosx', 'linux', 'win'):
-    _clipboards.append(
-        ('sdl2', 'clipboard_sdl2', 'ClipboardSDL2'))
     _clipboards.append(
         ('pygame', 'clipboard_pygame', 'ClipboardPygame'))
+    _clipboards.append(
+        ('sdl2', 'clipboard_sdl2', 'ClipboardSDL2'))
 _clipboards.append(
     ('dummy', 'clipboard_dummy', 'ClipboardDummy'))
 

kivy/core/image/__init__.py

@@ -817,8 +817,8 @@ def load(filename):
 image_libs += [
     ('tex', 'img_tex'),
     ('dds', 'img_dds'),
-    ('sdl2', 'img_sdl2'),
     ('pygame', 'img_pygame'),
+    ('sdl2', 'img_sdl2'),
     ('ffpy', 'img_ffpyplayer'),
     ('pil', 'img_pil'),
     ('gif', 'img_gif')]

kivy/core/text/__init__.py

@@ -673,8 +673,8 @@ def _set_text_size(self, x):
 
 # Load the appropriate provider
 Label = core_select_lib('text', (
-    ('sdl2', 'text_sdl2', 'LabelSDL2'),
     ('pygame', 'text_pygame', 'LabelPygame'),
+    ('sdl2', 'text_sdl2', 'LabelSDL2'),
     ('sdlttf', 'text_sdlttf', 'LabelSDLttf'),
     ('pil', 'text_pil', 'LabelPIL'),
 ))

kivy/tools/packaging/linux/debian/control

@@ -14,6 +14,7 @@ Build-Depends: debhelper (>= 7.0.50~), pkg-config,
                libgl1-mesa-dev,
                libgles2-mesa-dev,
                libsdl-ttf2.0-dev,
+               libsdl2-dev, libsdl2-image-dev, libsdl2-mixer-dev, libsdl2-ttf-dev,
                libgstreamer1.0-dev | libgstreamer0.10-dev,
                texlive-latex-base, texlive-latex-recommended, texlive-latex-extra, texlive-fonts-extra, texlive-fonts-recommended,
 Standards-Version: 3.9.1

setup.py

@@ -224,6 +224,10 @@ def update_if_changed(self, fn, content):
     if 'libraries' in gst_flags:
         c_options['use_gstreamer'] = True
 
+sdl2_flags = pkgconfig('sdl2', 'SDL2_ttf', 'SDL2_image', 'SDL2_mixer')
+if 'libraries' in sdl2_flags:
+    c_options['use_sdl2'] = True
+
 
 # -----------------------------------------------------------------------------
 # declare flags
@@ -396,14 +400,19 @@ def determine_sdl2():
 
     sdl2_path = environ.get('KIVY_SDL2_PATH', None)
 
+    if sdl2_flags and not sdl2_path:
+        return sdl2_flags
+
+    # no pkgconfig info, or we want to use a specific sdl2 path, so perform
+    # manual configuration
     flags['libraries'] = ['SDL2', 'SDL2_ttf', 'SDL2_image', 'SDL2_mixer']
     flags['include_dirs'] = ([sdl2_path] if sdl2_path else
                              ['/usr/local/include/SDL2', '/usr/include/SDL2'])
 
     flags['extra_link_args'] = []
     flags['extra_compile_args'] = []
     flags['extra_link_args'] += (['-L' + sdl2_path] if sdl2_path else
-                             ['-L/usr/local/lib/'])
+                                 ['-L/usr/local/lib/'])
 
     # ensure headers for all the SDL2 and sub libraries are available
     libs_to_check = ['SDL', 'SDL_mixer', 'SDL_ttf', 'SDL_image']