Update Win32 build notes

audacious-media-player · Feb 13, 2024 · 0a8bc9d · 0a8bc9d
1 parent d8f5366
commit 0a8bc9d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 43 deletions.
diff --git a/win32/Makefile b/win32/Makefile
@@ -9,14 +9,13 @@ gtk: gtk+-2.24.33.tar.xz
 	cd gtk+-2.24.33 && CFLAGS="-O2 -fcommon" ./configure --prefix=$(LIB_PREFIX)
 	cd gtk+-2.24.33 && $(MAKE) && $(MAKE) install
 
-ffmpeg-5.1.2.tar.xz:
-	wget https://ffmpeg.org/releases/ffmpeg-5.1.2.tar.xz
+ffmpeg-6.1.1.tar.xz:
+	wget https://ffmpeg.org/releases/ffmpeg-6.1.1.tar.xz
 
-ffmpeg: ffmpeg-5.1.2.tar.xz
-	tar xf ffmpeg-5.1.2.tar.xz
-	cd ffmpeg-5.1.2 && patch -p1 < ../patches/ffmpeg-hwcontext_vulkan.c.diff
-	cd ffmpeg-5.1.2 && ./configure --prefix=$(LIB_PREFIX) --enable-shared --disable-yasm --cpu=i686
-	cd ffmpeg-5.1.2 && $(MAKE) && $(MAKE) install
+ffmpeg: ffmpeg-6.1.1.tar.xz
+	tar xf ffmpeg-6.1.1.tar.xz
+	cd ffmpeg-6.1.1 && ./configure --prefix=$(LIB_PREFIX) --enable-shared --disable-yasm --cpu=i686
+	cd ffmpeg-6.1.1 && $(MAKE) && $(MAKE) install
 
 libmms-0.6.4.tar.gz:
 	wget https://sourceforge.net/projects/libmms/files/libmms/0.6.4/libmms-0.6.4.tar.gz
@@ -44,3 +43,11 @@ adplug: adplug-2.3.3.tar.bz2
 	tar xf adplug-2.3.3.tar.bz2
 	cd adplug-2.3.3 && ./configure --prefix=$(LIB_PREFIX)
 	cd adplug-2.3.3 && $(MAKE) && $(MAKE) install
+
+libsidplayfp-2.6.0.tar.gz:
+	wget https://sourceforge.net/projects/sidplay-residfp/files/libsidplayfp/2.6/libsidplayfp-2.6.0.tar.gz
+
+libsidplayfp: libsidplayfp-2.6.0.tar.gz
+	tar xf libsidplayfp-2.6.0.tar.gz
+	cd libsidplayfp-2.6.0 && ./configure --prefix=$(LIB_PREFIX)
+	cd libsidplayfp-2.6.0 && $(MAKE) && $(MAKE) install
diff --git a/win32/notes.html b/win32/notes.html
@@ -34,13 +34,14 @@ <h3>Set up MSYS2 environment</h3>
 pacman -S autoconf automake git libtool make patch pkg-config<br>
 pacman -S mingw-w64-i686-gcc mingw-w64-i686-gettext mingw-w64-i686-libxml2<br>
 pacman -S mingw-w64-i686-atk mingw-w64-i686-cairo mingw-w64-i686-pango<br>
-pacman -S mingw-w64-i686-gdk-pixbuf2 mingw-w64-i686-librsvg mingw-w64-i686-qt5<br>
+pacman -S mingw-w64-i686-gdk-pixbuf2 mingw-w64-i686-librsvg mingw-w64-i686-qt5-base<br>
+pacman -S mingw-w64-i686-qt5-imageformats mingw-w64-i686-qt5-multimedia mingw-w64-i686-qt5-svg<br>
 pacman -S mingw-w64-i686-flac mingw-w64-i686-libvorbis mingw-w64-i686-libcdio-paranoia<br>
 pacman -S mingw-w64-i686-fluidsynth mingw-w64-i686-mpg123 mingw-w64-i686-faad2<br>
 pacman -S mingw-w64-i686-wavpack mingw-w64-i686-libmodplug mingw-w64-i686-libbs2b<br>
 pacman -S mingw-w64-i686-libsamplerate mingw-w64-i686-libsoxr mingw-w64-i686-neon<br>
-pacman -S mingw-w64-i686-libsidplayfp mingw-w64-i686-libopenmpt<br>
-pacman -S mingw-w64-i686-libcue mingw-w64-i686-lame mingw-w64-i686-opusfile</tt></p></blockquote>
+pacman -S mingw-w64-i686-libcue mingw-w64-i686-lame mingw-w64-i686-opusfile<br>
+pacman -S mingw-w64-i686-libopenmpt</tt></p></blockquote>
 
 <h3>Install GTK+</h3>
 
@@ -60,7 +61,8 @@ <h3>Install additional libraries</h3>
 make -j$(nproc) ffmpeg<br>
 make -j$(nproc) libmms<br>
 make -j$(nproc) libbinio<br>
-make -j$(nproc) adplug</tt></p></blockquote>
+make -j$(nproc) adplug<br>
+make -j$(nproc) libsidplayfp</tt></p></blockquote>
 
 <h3>Install Audacious</h3>
 

diff --git a/win32/patches/ffmpeg-hwcontext_vulkan.c.diff b/win32/patches/ffmpeg-hwcontext_vulkan.c.diff