Skip to content

Commit 8a1330c

Browse files
GcenxIsaacMarovitz
andauthored
build.yml: Cleanup CFLAGS & CROSSCFLAGS (#14)
* build.yml: Cleanup CFLAGS & CROSSCFLAGS * build.yml: Update `Copy External Libs` libopenvino to ver 2420 * Update build.yml * Ffmpeg 7 * Remove libopenvino * Bump libjxl * Remove libpugixml * Update build.yml * Ugh * Make up ur mind * Update build.yml * Update build.yml * Update ffmpeg libs * Bump version --------- Co-authored-by: Isaac Marovitz <42140194+IsaacMarovitz@users.noreply.github.com>
1 parent c624348 commit 8a1330c

File tree

2 files changed

+16
-28
lines changed

2 files changed

+16
-28
lines changed

.github/workflows/build.yml

+14-26
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ env:
1010
CXX: clang++
1111
CPATH: /usr/local/include
1212
LIBRARY_PATH: /usr/local/lib
13-
CFLAGS: -O3 -Wno-deprecated-declarations -Wno-format -Wno-incompatible-pointer-types -Wno-implicit-function-declaration -Wno-int-conversion
14-
CROSSCFLAGS: -O3 -Wno-deprecated-declarations -Wno-format -Wno-incompatible-pointer-types -Wno-implicit-function-declaration -Wno-int-conversion
13+
CFLAGS: -O3
14+
CROSSCFLAGS: -O3 -Wno-error=incompatible-pointer-types -Wno-error=int-conversion
1515
LDFLAGS: -Wl,-ld_classic -Wl,-headerpad_max_install_names -Wl,-rpath,@loader_path/../../ -Wl,-rpath,/usr/local/lib
1616
MACOSX_DEPLOYMENT_TARGET: 10.14
1717
WINE_CONFIGURE: $GITHUB_WORKSPACE/configure
@@ -37,9 +37,6 @@ jobs:
3737
"pkg-config"
3838
"gcenx/wine/cx-llvm"
3939
40-
# Utilities (DXVK)
41-
"jq"
42-
4340
# Dependencies
4441
"freetype"
4542
"gettext"
@@ -50,6 +47,7 @@ jobs:
5047
"winetricks"
5148
)
5249
50+
brew update
5351
brew install "${REQUIRED_PACKAGES[@]}"
5452
5553
- name: Install mingw
@@ -67,7 +65,7 @@ jobs:
6765
ls $(brew --prefix)/lib
6866
6967
echo "FFmpeg Libs"
70-
ls $(brew --prefix ffmpeg@6)/lib
68+
ls $(brew --prefix ffmpeg@7)/lib
7169
7270
echo "GStreamer Libs"
7371
ls $(brew --prefix gstreamer)/lib/gstreamer-1.0
@@ -252,24 +250,15 @@ jobs:
252250
"libidn2.0"
253251
"libintl.8"
254252
"libjpeg.8"
255-
"libjxl.0.10"
256-
"libjxl_threads.0.10"
253+
"libjxl.0.11"
254+
"libjxl_threads.0.11"
257255
"libMoltenVK"
258256
"libnettle.8"
259257
"libogg.0"
260-
"libopenvino.2410"
261-
"libopenvino_c.2410"
262-
"libopenvino_onnx_frontend.2410"
263-
"libopenvino_paddle_frontend.2410"
264-
"libopenvino_pytorch_frontend.2410"
265-
"libopenvino_tensorflow_frontend.2410"
266-
"libopenvino_tensorflow_lite_frontend.2410"
267258
"liborc-0.4.0"
268259
"libp11-kit.0"
269260
"libpcre2-8.0"
270-
"libpostproc.57"
271261
"libpng16.16"
272-
"libpugixml.1"
273262
"librav1e.0.7"
274263
"librist.4"
275264
"librubberband.2"
@@ -278,7 +267,6 @@ jobs:
278267
"libsoxr.0"
279268
"libsrt.1.5"
280269
"libtasn1.6"
281-
"libtbb.12"
282270
"libunistring.5"
283271
"libvidstab.1.2"
284272
"libvmaf.3"
@@ -299,13 +287,13 @@ jobs:
299287
)
300288
301289
FFMPEG_LIBS=(
302-
"libavfilter.9"
303-
"libavformat.60"
304-
"libavcodec.60"
305-
"libavutil.58"
306-
"libpostproc.57"
307-
"libswresample.4"
308-
"libswscale.7"
290+
"libavfilter.10"
291+
"libavformat.61"
292+
"libavcodec.61"
293+
"libavutil.59"
294+
"libpostproc.58"
295+
"libswresample.5"
296+
"libswscale.8"
309297
)
310298
311299
GSTREAMER_LIBS=(
@@ -337,7 +325,7 @@ jobs:
337325
338326
for i in "${FFMPEG_LIBS[@]}"
339327
do
340-
cp -Lr $(brew --prefix ffmpeg@6)/lib/"$i".dylib Libraries/Wine/lib
328+
cp -Lr $(brew --prefix ffmpeg@7)/lib/"$i".dylib Libraries/Wine/lib
341329
done
342330
343331
mkdir Libraries/Wine/lib/gstreamer-1.0

WhiskyWineVersion.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
<key>major</key>
1010
<integer>2</integer>
1111
<key>minor</key>
12-
<integer>3</integer>
12+
<integer>4</integer>
1313
<key>patch</key>
14-
<integer>3</integer>
14+
<integer>0</integer>
1515
<key>preRelease</key>
1616
<string></string>
1717
</dict>

0 commit comments

Comments
 (0)