Skip to content

Commit a4c09fb

Browse files
authored
use liblzma(xz) to replace lzma sdk (#3065)
1 parent 1647507 commit a4c09fb

19 files changed

Lines changed: 155 additions & 5138 deletions

.github/workflows/build.yml

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,18 @@ jobs:
180180
7z x ${{ steps.sqlite.outputs.filepath }}
181181
mv sqlite-amalgamation-3510300 sqlite3
182182
183+
- name: Download lzma (xz)
184+
id: lzma
185+
uses: mercury233/action-cache-download-file@v1.2.0
186+
with:
187+
url: https://github.com/tukaani-project/xz/releases/download/v5.8.3/xz-5.8.3.tar.gz
188+
sha256: 3d3a1b973af218114f4f889bbaa2f4c037deaae0c8e815eec381c3d546b974a0
189+
190+
- name: Extract lzma
191+
run: |
192+
tar xf ${{ steps.lzma.outputs.filepath }}
193+
mv xz-5.8.3 lzma
194+
183195
- name: Create miniaudio external directory
184196
run: |
185197
mkdir -p miniaudio/external
@@ -246,6 +258,7 @@ jobs:
246258
png/
247259
zlib/
248260
sqlite3/
261+
lzma/
249262
miniaudio/
250263
!miniaudio/external/opus/dnn/
251264
@@ -421,6 +434,7 @@ jobs:
421434
include:
422435
- name: ubuntu-22
423436
os: ubuntu-22.04
437+
apt-outdated: true
424438
- name: ubuntu-24
425439
os: ubuntu-24.04
426440
- name: ubuntu-static-link
@@ -459,7 +473,7 @@ jobs:
459473
- name: Install dependencies (dynamic link)
460474
if: matrix.static-link != true
461475
run: |
462-
sudo apt-get install -y libevent-dev libfreetype6-dev libsqlite3-dev libopusfile-dev libvorbis-dev libjpeg-dev libpng-dev zlib1g-dev
476+
sudo apt-get install -y libevent-dev libfreetype6-dev libsqlite3-dev libopusfile-dev libvorbis-dev libjpeg-dev libpng-dev zlib1g-dev liblzma-dev
463477
464478
- name: Install NASM
465479
if: matrix.static-link == true
@@ -524,6 +538,20 @@ jobs:
524538
./configure
525539
cd ../../..
526540
541+
- name: Download lzma (xz)
542+
if: matrix.apt-outdated == true
543+
id: lzma
544+
uses: mercury233/action-cache-download-file@v1.2.0
545+
with:
546+
url: https://github.com/tukaani-project/xz/releases/download/v5.8.3/xz-5.8.3.tar.gz
547+
sha256: 3d3a1b973af218114f4f889bbaa2f4c037deaae0c8e815eec381c3d546b974a0
548+
549+
- name: Extract lzma
550+
if: matrix.apt-outdated == true
551+
run: |
552+
tar xf ${{ steps.lzma.outputs.filepath }}
553+
mv xz-5.8.3 lzma
554+
527555
- name: Copy premake files
528556
run: |
529557
cp -pr premake/* .
@@ -532,7 +560,7 @@ jobs:
532560
- name: Use premake to generate make files (apt packages)
533561
if: matrix.static-link != true
534562
run: |
535-
./premake5 gmake
563+
./premake5 gmake ${{ matrix.apt-outdated == true && '--build-lzma' || '' }}
536564
537565
- name: Use premake to generate make files (static link)
538566
if: matrix.static-link == true
@@ -544,6 +572,7 @@ jobs:
544572
--build-zlib \
545573
--build-freetype \
546574
--build-sqlite \
575+
--build-lzma \
547576
--build-opus-vorbis
548577
549578
- name: Make
@@ -607,7 +636,7 @@ jobs:
607636
if: matrix.static-link != true
608637
run: |
609638
brew install opus opusfile libvorbis zlib
610-
# brew install sqlite libx11 freetype libevent libjpeg-turbo libpng
639+
# brew install sqlite libx11 freetype libevent libjpeg-turbo libpng xz
611640

612641
- name: Install NASM
613642
if: matrix.static-link == true
@@ -687,6 +716,7 @@ jobs:
687716
--build-zlib \
688717
--build-freetype \
689718
--build-sqlite \
719+
--build-lzma \
690720
--build-opus-vorbis
691721
692722
- name: Make

gframe/lzma/Alloc.c

Lines changed: 0 additions & 127 deletions
This file was deleted.

gframe/lzma/Alloc.h

Lines changed: 0 additions & 38 deletions
This file was deleted.

gframe/lzma/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)