From f3db7ac3079c61239e4400c324a29196540d2ad1 Mon Sep 17 00:00:00 2001
From: WeebDataHoarder <57538841+WeebDataHoarder@users.noreply.github.com>
Date: Thu, 28 Jul 2022 15:43:55 +0200
Subject: [PATCH] Added vorbis build dependency, changed ci to alpine

---
 .drone.yml |  8 +++-----
 Dockerfile | 20 ++++++++++++++------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 9f87435..966a419 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,12 +5,10 @@ name: default
 
 steps:
   - name: test
-    image: golang:1.18-bullseye
+    image: golang:1.18-alpine
     commands:
-      - DEBIAN_FRONTEND=noninteractive apt update
-      - DEBIAN_FRONTEND=noninteractive apt install -y git build-essential autoconf automake libtool libflac-dev libopus-dev libopusfile-dev libsamplerate0-dev libmp3lame-dev libebur128-dev
-      - git clone --depth 1 https://github.com/xiph/libopusenc.git && cd libopusenc && ./autogen.sh && ./configure --prefix /usr && make && make install && cd ..
-      - git clone --depth 1 https://github.com/mstorsjo/fdk-aac.git && cd fdk-aac && ./autogen.sh && ./configure --prefix /usr && make -j$(nproc) && make install && cd ..
+      - apk update
+      - apk add --no-cache git gcc g++ musl-dev bash autoconf automake cmake make libtool gettext openssl-dev flac-dev opus-dev opusfile-dev libopusenc-dev vorbis-dev libsamplerate-dev lame-dev libebur128-dev fdk-aac-dev --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community
       - git clone --depth 1 https://git.gammaspectra.live/S.O.N.G/alac.git && cd alac && autoreconf -fi && ./configure --prefix /usr && make && make install && cd ..
       - go build -v .
 
diff --git a/Dockerfile b/Dockerfile
index 14b07c2..a44ec96 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,35 +33,42 @@ RUN wget https://downloads.sourceforge.net/project/lame/lame/3.100/lame-3.100.ta
     make install && \
     cd ..
     
-RUN git clone --depth 1 --branch v1.3.5 https://github.com/xiph/ogg.git && cd ogg && \
+RUN git clone --depth 1 --branch v1.3.5 https://gitlab.xiph.org/xiph/ogg.git && cd ogg && \
     ./autogen.sh && \
     ./configure --prefix /usr &&  \
     make -j$(nproc) && \
     make install && \
     cd ..
     
-RUN git clone --branch master https://github.com/xiph/opus.git && cd opus && \
+RUN git clone --branch master https://gitlab.xiph.org/xiph/opus.git && cd opus && \
     ./autogen.sh && \
     ./configure --enable-float-approx --prefix /usr &&  \
     make -j$(nproc) && \
     make install && \
     cd ..
     
-RUN git clone --depth 1 --branch v0.12 https://github.com/xiph/opusfile.git && cd opusfile && \
+RUN git clone --depth 1 --branch v0.12 https://gitlab.xiph.org/xiph/opusfile.git && cd opusfile && \
     ./autogen.sh && \
     ./configure --prefix /usr &&  \
     make -j$(nproc) && \
     make install && \
     cd ..
     
-RUN git clone --depth 1 --branch master https://github.com/xiph/libopusenc.git && cd libopusenc && \
+RUN git clone --depth 1 --branch master https://gitlab.xiph.org/xiph/libopusenc.git && cd libopusenc && \
     ./autogen.sh && \
     ./configure --prefix /usr &&  \
     make -j$(nproc) && \
     make install && \
     cd ..
     
-RUN git clone --depth 1 --branch 1.3.4 https://github.com/xiph/flac.git && cd flac && \
+RUN git clone --depth 1 --branch v1.3.7 https://gitlab.xiph.org/xiph/vorbis.git && cd vorbis && \
+    ./autogen.sh && \
+    ./configure --prefix /usr &&  \
+    make -j$(nproc) && \
+    make install && \
+    cd ..
+
+RUN git clone --depth 1 --branch 1.3.4 https://gitlab.xiph.org/xiph/flac.git && cd flac && \
     ./autogen.sh && \
     ./configure --prefix /usr &&  \
     make -j$(nproc) && \
@@ -82,7 +89,7 @@ RUN git clone --depth 1 https://git.gammaspectra.live/S.O.N.G/alac.git && cd ala
     make install && \
     cd ..
 
-RUN rm -rf /src/libebur128 /src/libsamplerate /src/lame-3.100 /src/ogg /src/opus /src/opusfile /src/flac /src/libopusenc /src/fdk-aac /src/alac
+RUN rm -rf /src/libebur128 /src/libsamplerate /src/lame-3.100 /src/ogg /src/opus /src/opusfile /src/vorbis /src/flac /src/libopusenc /src/fdk-aac /src/alac
 
 COPY . /code
 WORKDIR /code
@@ -98,6 +105,7 @@ COPY --from=builder /usr/lib/libfdk* /usr/lib/
 COPY --from=builder /usr/lib/libFLAC* /usr/lib/
 COPY --from=builder /usr/lib/libopus* /usr/lib/
 COPY --from=builder /usr/lib/libogg* /usr/lib/
+COPY --from=builder /usr/lib/libvorbis* /usr/lib/
 COPY --from=builder /usr/lib/libebur128* /usr/lib/
 COPY --from=builder /usr/lib/libalac* /usr/lib/
 COPY --from=builder /usr/bin/MeteorLight /usr/bin/MeteorLight