Merge branch 'vorbis' into 'master'

Add ogg and vorbis packages, enable them in sdl_mixer and syobonaction

See merge request redox-os/cookbook!202

recipes/libogg/recipe.sh

@@ -0,0 +1,41 @@
+VERSION=1.3.3
+TAR=http://downloads.xiph.org/releases/ogg/libogg-$VERSION.tar.xz
+TAR_SHA256=4f3fc6178a533d392064f14776b23c397ed4b9f48f5de297aba73b643f955c08
+
+function recipe_version {
+    echo "$VERSION"
+    skip=1
+}
+
+function recipe_update {
+    echo "skipping update"
+    skip=1
+}
+
+function recipe_build {
+    wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
+
+    ./configure \
+        --build=${BUILD} \
+        --host=${HOST} \
+        --prefix=''
+    make -j"$(nproc)"
+    skip=1
+}
+
+function recipe_test {
+    echo "skipping test"
+    skip=1
+}
+
+function recipe_clean {
+    make clean
+    skip=1
+}
+
+function recipe_stage {
+    dest="$(realpath $1)"
+    make DESTDIR="$dest" install
+    rm -f "$dest/lib/"*.la
+    skip=1
+}

recipes/libvorbis/recipe.sh

@@ -0,0 +1,40 @@
+VERSION=1.3.6
+TAR=http://downloads.xiph.org/releases/vorbis/libvorbis-$VERSION.tar.xz
+TAR_SHA256=af00bb5a784e7c9e69f56823de4637c350643deedaf333d0fa86ecdba6fcb415
+BUILD_DEPENDS=(libogg)
+
+function recipe_version {
+    echo "$VERSION"
+    skip=1
+}
+
+function recipe_update {
+    echo "skipping update"
+    skip=1
+}
+
+function recipe_build {
+    ./configure \
+        --build=${BUILD} \
+        --host=${HOST} \
+        --prefix=''
+    make -j"$(nproc)"
+    skip=1
+}
+
+function recipe_test {
+    echo "skipping test"
+    skip=1
+}
+
+function recipe_clean {
+    make clean
+    skip=1
+}
+
+function recipe_stage {
+    dest="$(realpath $1)"
+    make DESTDIR="$dest" install
+    rm -f "$dest/lib/"*.la
+    skip=1
+}

recipes/sdl_mixer/recipe.sh

@@ -1,6 +1,6 @@
 VERSION=1.2.12
 TAR=https://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-$VERSION.tar.gz
-BUILD_DEPENDS=(sdl liborbital)
+BUILD_DEPENDS=(sdl liborbital libogg libvorbis)
 
 function recipe_version {
     echo "$VERSION"
@@ -16,11 +16,13 @@ function recipe_build {
     sysroot="$(realpath ../sysroot)"
     export CFLAGS="-I$sysroot/include"
     export LDFLAGS="-L$sysroot/lib"
+    export LIBS="-lvorbis -logg"
     ./autogen.sh
     ./configure \
         --prefix=/ \
         --build=${BUILD} \
         --host=${HOST} \
+        --enable-music-ogg \
         --disable-shared \
         --disable-sdltest \
         --disable-music-cmd \

recipes/syobonaction/01_redox.patch

@@ -31,7 +31,7 @@ diff -rupNw source-original/Makefile source/Makefile
 @@ -1,8 +1,8 @@
  SyobonAction:main.o loadg.o DxLib.o
 -	gcc main.o loadg.o DxLib.o -o SyobonAction `sdl-config --libs` -lSDL_gfx -lSDL_image -lSDL_mixer -lSDL_ttf
-+	${CXX} ${LDFLAGS} main.o loadg.o DxLib.o -o SyobonAction `${SDL_CONFIG} --libs` -lSDL_gfx -lSDL_image -lSDL_mixer -lpng -ljpeg -lz -lSDL -lSDL_ttf -lfreetype
++	${CXX} ${LDFLAGS} main.o loadg.o DxLib.o -o SyobonAction `${SDL_CONFIG} --libs` -lSDL_gfx -lSDL_image -lSDL_mixer -lpng -ljpeg -lz -lSDL -lSDL_ttf -lfreetype -lvorbisfile -lvorbis -logg
  main.o:main.cpp
 -	gcc -c main.cpp
 +	${CXX} ${CPPFLAGS} `${SDL_CONFIG} --cflags` -c main.cpp

recipes/syobonaction/recipe.sh

@@ -1,6 +1,6 @@
 VERSION=1.0-rc3
 GIT=https://github.com/angelXwind/OpenSyobonAction
-BUILD_DEPENDS=(sdl liborbital sdl_mixer sdl_image sdl_gfx sdl_ttf freetype libjpeg libpng zlib)
+BUILD_DEPENDS=(sdl liborbital sdl_mixer sdl_image sdl_gfx sdl_ttf freetype libjpeg libpng zlib libogg libvorbis)
 
 function recipe_version {
     echo "$VERSION"