Replace mercurial's tar.bz2 with the primary tar.gz #4

kcgen · 2018-09-03T18:38:32Z

Solves WohlSoft/SDL-Mixer-X#21, which is due a flaw in Mercurial's generated tar.bz2 file.

Using SDL2's tar.gz file now extracts cleanly:

<snip>
-- [download 100% complete]
-- Downloading... done
-- extracting...
     src='/usr/src/SDL-Mixer-X/build/external/AudioCodecs/src/AudioCodecs-build/external/SDL2/src/SDL2-2.0.8.tar.gz'
     dst='/usr/src/SDL-Mixer-X/build/external/AudioCodecs/src/AudioCodecs-build/external/SDL2/src/SDL2HG'
-- extracting... [tar xfz]
-- extracting... [analysis]
-- extracting... [rename]
-- extracting... [clean up]
-- extracting... done
[  1%] No patch step for 'SDL2HG'
[  1%] No update step for 'SDL2HG'
[  1%] Performing configure step for 'SDL2HG'
-- The C compiler identification is GNU 7.3.0
<snip>

Attempting to solve WohlSoft/SDL-Mixer-X#21, which is due to cmake's internal tar-extractor failing on the bz2 file.

Wohlstand · 2018-09-03T18:44:25Z

Please make it to be an option to choose which version of SDL2 to pull: stable release or dev one from HG. Myself I using most fresh SDL2 as sometimes I finding bugs in it and I posting fixes of them to SDL2 team and there are accepting them.

Look to my AppVeyor builds are using MinGW-w64 and successfully compiling, pulling, unpacking SDL2 from HG. I bet you have forgot to install bzip2 into your msys2...

…lled

Wohlstand · 2018-09-03T19:31:23Z

download_sdl2_hg.cmake

@@ -42,6 +43,6 @@ install(
    CODE "file( INSTALL \${builtSdl2Heads} DESTINATION \"${CMAKE_INSTALL_PREFIX}/include/SDL2\" )"
    CODE "file( GLOB builtSdlLibs \"${CMAKE_BINARY_DIR}/lib/*SDL2*\" )"
    CODE "file( INSTALL \${builtSdlLibs} DESTINATION \"${CMAKE_INSTALL_PREFIX}/lib\" )"
-    CODE "file( GLOB builtSdlBins \"${CMAKE_BINARY_DIR}/bin/*SDL2*\" )"
+    CODE "file( GLOB builtSdlBins \"${CMAKE_BINARY_DIR}/bin/*\" )"


It's bad idea: every other library that included into this AudioCodecs pack is adding into same install path. so, making this you making duplicates be installed which will overflow the queue...

Wohlstand · 2018-09-03T19:33:42Z

download_sdl2_hg.cmake

@@ -26,11 +26,12 @@ endif()
 ExternalProject_Add(
    SDL2HG
    PREFIX ${CMAKE_BINARY_DIR}/external/SDL2
-    URL https://hg.libsdl.org/SDL/archive/default.tar.bz2
+    URL https://www.libsdl.org/release/SDL2-2.0.8.tar.gz


Why not to make the option:

option(SDL_USE_RELEASE ...) if(SDL_USE_RELEASE) set(SDL_TAR_URL "https://www.libsdl.org/release/SDL2-2.0.8.tar.gz") else() set(SDL_TAR_URL "https://hg.libsdl.org/SDL/archive/default.tar.bz2") endif()

It's better to give a choice than force one of...

…chives

Wohlstand · 2018-09-03T20:31:51Z

download_sdl2_hg.cmake

@@ -26,7 +27,7 @@ endif()
 ExternalProject_Add(
    SDL2HG
    PREFIX ${CMAKE_BINARY_DIR}/external/SDL2
-    URL https://www.libsdl.org/release/SDL2-2.0.8.tar.gz
+    GIT_REPOSITORY https://github.com/spurious/SDL-mirror.git


Please keep old URL as comment:

# FIXME: Return back old URL when SDL2 team will fix this issue: https://bugzilla.libsdl.org/show_bug.cgi?id=4248 # URL https://hg.libsdl.org/SDL/archive/default.tar.bz2

Wohlstand · 2018-09-03T20:38:20Z

download_sdl2_hg.cmake

    CMAKE_ARGS
        "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
        "-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}"
        -DSNDIO=OFF
+        -DSDL_SHARED=${SHARED}


Let's this will be a part of this?
#5

Anyway, as it's undefined now, it will cause an error... Please define next options:

option(AudioCodecs_SDL2_STATIC ...) option(AudioCodecs_SDL2_SHARED ...)

which are both will be ON by default.
Then, pass them as:

-DSDL_SHARED=${AudioCodecs_SDL2_SHARED} -DSDL_STATIC=${AudioCodecs_SDL2_STATIC}

Wohlstand · 2018-09-03T20:40:34Z

download_sdl2_hg.cmake

@@ -27,7 +27,8 @@ endif()
 ExternalProject_Add(
    SDL2HG
    PREFIX ${CMAKE_BINARY_DIR}/external/SDL2
-    GIT_REPOSITORY https://github.com/spurious/SDL-mirror.git
+    URL https://hg.libsdl.org/SDL/archive/default.tar.bz2
+    # GIT_REPOSITORY https://github.com/spurious/SDL-mirror.git


LOL 🤣
Are you wanted to put GIT repo in a top? I have asked you to keep old URL as comment, but you are did opposite: you have kept old URL but temporary GIT as comment! 🤣 🦊

Wohlstand · 2018-09-04T21:52:24Z

Okay, tomorrow I'll take this for polishing and then merge after set of changes... For now I have tired after a hard day.

Wohlstand · 2018-09-06T21:36:10Z

download_sdl2_hg.cmake

    CMAKE_ARGS
-        "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
-        "-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}"
+        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}


The reason why those are quoted - ability to have space-contained paths. Removal of quotes breaks the support of them.

Wohlstand · 2018-09-06T21:49:33Z

I have merged this with some of changes I have made by myself. I have added two options:

BUILD_SDL2_SHARED where you can enable or disable shared build of downloading SDL2
BUILD_SDL2_STATIC where you can enable or disable static build of downloading SDL2

Replace mercurial's tar.bz2 with the primary tar.gz

1c02a7a

Attempting to solve WohlSoft/SDL-Mixer-X#21, which is due to cmake's internal tar-extractor failing on the bz2 file.

Kevin Croft added 2 commits September 3, 2018 12:14

Only build SDL2 statically

36e3482

Pass-through SHARED value to SDL, and ensure bin/sdl2-config is insta…

188a504

…lled

Wohlstand reviewed Sep 3, 2018

View reviewed changes

Switch to SDL2 git repo until SDL2 removing symlinks from their HG ar…

9360b73

…chives

Wohlstand reviewed Sep 3, 2018

View reviewed changes

Update download_sdl2_hg.cmake

63002d7

Wohlstand reviewed Sep 3, 2018

View reviewed changes

Kevin Croft added 4 commits September 3, 2018 13:45

Update download_sdl2_hg.cmake

5d4c7b5

Reflect the fact we're using the master branch from github (temporarily)

d37dbe0

Call git directly and use a shallow-clone

4ac917d

Enable cmake's native shallow-cloning

b514c8f

Wohlstand reviewed Sep 6, 2018

View reviewed changes

Wohlstand merged commit b514c8f into WohlSoft:master Sep 6, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replace mercurial's tar.bz2 with the primary tar.gz #4

Replace mercurial's tar.bz2 with the primary tar.gz #4

kcgen commented Sep 3, 2018

Wohlstand commented Sep 3, 2018

Wohlstand Sep 3, 2018

Wohlstand Sep 3, 2018

Wohlstand Sep 3, 2018

Wohlstand Sep 3, 2018

Wohlstand Sep 3, 2018

Wohlstand Sep 3, 2018

Wohlstand commented Sep 4, 2018

Wohlstand Sep 6, 2018

Wohlstand commented Sep 6, 2018

Replace mercurial's tar.bz2 with the primary tar.gz #4

Replace mercurial's tar.bz2 with the primary tar.gz #4

Conversation

kcgen commented Sep 3, 2018

Wohlstand commented Sep 3, 2018

Wohlstand Sep 3, 2018

Choose a reason for hiding this comment

Wohlstand Sep 3, 2018

Choose a reason for hiding this comment

Wohlstand Sep 3, 2018

Choose a reason for hiding this comment

Wohlstand Sep 3, 2018

Choose a reason for hiding this comment

Wohlstand Sep 3, 2018

Choose a reason for hiding this comment

Wohlstand Sep 3, 2018

Choose a reason for hiding this comment

Wohlstand commented Sep 4, 2018

Wohlstand Sep 6, 2018

Choose a reason for hiding this comment

Wohlstand commented Sep 6, 2018