Skip to content

Commit 1ffa4d3

Browse files
committed
Cleanup scripts / script output.
1 parent 4d92c5b commit 1ffa4d3

34 files changed

Lines changed: 175 additions & 70 deletions

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ jobs:
231231
push_release:
232232
if: |
233233
github.event_name == 'push' &&
234-
github.repository == 'clienthax/ps3libraries'
234+
github.repository == 'ps3dev/ps3libraries'
235235
needs: build
236236
runs-on: ubuntu-latest
237237
permissions:

archives/archives.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690 502379 https:
1717
9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf 2009217 https://downloads.sourceforge.net/project/flac/flac-src/flac-1.2.1-src/flac-1.2.1.tar.gz
1818
ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330 1137407 https://downloads.sourceforge.net/faac/faad2-2.7.tar.gz
1919
b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc 1903175 https://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
20-
9988283408c71838d8d62e5418e5abb5eb5300bd84c385fdc96143b5e8f10ed5 455089 https://codeload.github.com/json-c/json-c/tar.gz/json-c-0.11-20130402
20+
9988283408c71838d8d62e5418e5abb5eb5300bd84c385fdc96143b5e8f10ed5 455089 https://codeload.github.com/json-c/json-c/tar.gz/json-c-0.11-20130402 -> json-c-0.11-20130402.tar.gz
2121
19e5b81fdac0fe22009b9e2bdcd52d7dcafbf62bc67fc59cf0a76b5b5540d149 3489179 https://github.com/Mbed-TLS/mbedtls/releases/download/mbedtls-2.28.10/mbedtls-2.28.10.tar.bz2
2222
- - https://github.com/zeldin/SDL_PSL1GHT/tarball/master -> sdl_psl1ght.tar.gz
2323
- - https://github.com/zeldin/SDL_PSL1GHT_Libs/tarball/master -> sdl_psl1ght_libs.tar.gz

scripts/000-psl1ght.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
## Unpack the source code.
88
rm -Rf psl1ght
99
mkdir psl1ght
10-
tar --strip-components=1 --directory=psl1ght -xvzf ../archives/psl1ght.tar.gz
10+
echo "Unpacking psl1ght"
11+
pv -pterab ../archives/psl1ght.tar.gz | tar --strip-components=1 --directory=psl1ght -xzf -
1112
cd psl1ght
1213

1314
## Compile and install.

scripts/001-zlib-1.2.13.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ ZLIB="zlib-1.2.13"
66
../download.sh ${ZLIB}.tar.gz
77

88
## Unpack the source code.
9-
rm -Rf ${ZLIB} && tar xfvz ../archives/${ZLIB}.tar.gz && cd ${ZLIB}
9+
rm -Rf ${ZLIB}
10+
echo "Unpacking ${ZLIB}"
11+
pv -pterab ../archives/${ZLIB}.tar.gz | tar -xzf -
12+
cd ${ZLIB}
1013

1114
## Patch the source code.
1215
cat ../../patches/${ZLIB}-PPU.patch | patch -p1

scripts/002-libpng-1.4.4.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
#!/bin/sh -e
22
# libpng-1.4.4.sh by Naomi Peori (naomi@peori.ca)
3+
LIBPNG="libpng-1.4.4"
34

45
## Download the source code.
5-
../download.sh libpng-1.4.4.tar.gz
6+
../download.sh ${LIBPNG}.tar.gz
67

78
## Fetch config.guess and config.sub, falling back to copies if Savannah is unavailable
89
../utils/get-config-scripts.sh
910

1011
## Unpack the source code.
11-
rm -Rf libpng-1.4.4 && tar xfvz ../archives/libpng-1.4.4.tar.gz && cd libpng-1.4.4
12+
rm -Rf ${LIBPNG}
13+
echo "Unpacking ${LIBPNG}"
14+
pv -pterab ../archives/${LIBPNG}.tar.gz | tar -xzf -
15+
cd ${LIBPNG}
1216

1317
## Replace config.guess and config.sub
1418
cp ../../archives/config.guess ../../archives/config.sub .

scripts/003-jpeg-8b.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88
../utils/get-config-scripts.sh
99

1010
## Unpack the source code.
11-
rm -Rf jpeg-8b && tar xfvz ../archives/jpegsrc.v8b.tar.gz && cd jpeg-8b
11+
rm -Rf jpeg-8b
12+
echo "Unpacking jpegsrc.v8b"
13+
pv -pterab ../archives/jpegsrc.v8b.tar.gz | tar -xzf -
14+
cd jpeg-8b
1215

1316
## Replace config.guess and config.sub
1417
cp ../../archives/config.guess ../../archives/config.sub .

scripts/004-freetype-2.4.3.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
#!/bin/sh -e
22
# freetype-2.4.3.sh by Naomi Peori (naomi@peori.ca)
3+
FREETYPE="freetype-2.4.3"
34

45
## Download the source code.
5-
../download.sh freetype-2.4.3.tar.gz
6+
../download.sh ${FREETYPE}.tar.gz
67

78
## Fetch config.guess and config.sub, falling back to copies if Savannah is unavailable
89
../utils/get-config-scripts.sh
910

1011
## Unpack the source code.
11-
rm -Rf freetype-2.4.3 && tar xfvz ../archives/freetype-2.4.3.tar.gz && cd freetype-2.4.3
12+
rm -Rf ${FREETYPE}
13+
echo "Unpacking ${FREETYPE}"
14+
pv -pterab ../archives/${FREETYPE}.tar.gz | tar -xzf -
15+
cd ${FREETYPE}
1216

1317
## Replace config.guess and config.sub
1418
cp ../../archives/config.guess ../../archives/config.sub builds/unix/

scripts/005-pixman-0.20.0.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
#!/bin/sh -e
22
# pixman-0.20.0.sh by Naomi Peori (naomi@peori.ca)
3+
PIXMAN="pixman-0.20.0"
34

45
## Download the source code.
5-
../download.sh pixman-0.20.0.tar.gz
6+
../download.sh ${PIXMAN}.tar.gz
67

78
## Fetch config.guess and config.sub, falling back to copies if Savannah is unavailable
89
../utils/get-config-scripts.sh
910

1011
## Unpack the source code.
11-
rm -Rf pixman-0.20.0 && tar xfvz ../archives/pixman-0.20.0.tar.gz && cd pixman-0.20.0
12+
rm -Rf ${PIXMAN}
13+
echo "Unpacking ${PIXMAN}"
14+
pv -pterab ../archives/${PIXMAN}.tar.gz | tar -xzf -
15+
cd ${PIXMAN}
1216

1317
## Replace config.guess and config.sub
1418
cp ../../archives/config.guess ../../archives/config.sub .

scripts/006-cairo-1.10.0.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
#!/bin/sh -e
22
# cairo-1.10.0.sh by Naomi Peori (naomi@peori.ca)
3+
CAIRO="cairo-1.10.0"
34

45
## Download the source code.
5-
../download.sh cairo-1.10.0.tar.gz
6+
../download.sh ${CAIRO}.tar.gz
67

78
## Fetch config.guess and config.sub, falling back to copies if Savannah is unavailable
89
../utils/get-config-scripts.sh
910

1011
## Unpack the source code.
11-
rm -Rf cairo-1.10.0 && tar xfvz ../archives/cairo-1.10.0.tar.gz && cd cairo-1.10.0
12+
rm -Rf ${CAIRO}
13+
echo "Unpacking ${CAIRO}"
14+
pv -pterab ../archives/${CAIRO}.tar.gz | tar -xzf -
15+
cd ${CAIRO}
1216

1317
## Replace config.guess and config.sub
1418
cp ../../archives/config.guess ../../archives/config.sub build/
1519

1620
## Patch the source code.
17-
cat ../../patches/cairo-1.10.0.patch | patch -p1
21+
cat ../../patches/${CAIRO}.patch | patch -p1
1822

1923
## Create the build directory.
2024
mkdir build-ppu && cd build-ppu

scripts/007-libogg-1.3.4.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
#!/bin/sh -e
22
# libogg-1.3.4.sh by Naomi Peori (naomi@peori.ca)
3+
LIBOGG="libogg-1.3.4"
34

45
## Download the source code.
5-
../download.sh libogg-1.3.4.tar.gz
6+
../download.sh ${LIBOGG}.tar.gz
67

78
## Fetch config.guess and config.sub, falling back to copies if Savannah is unavailable
89
../utils/get-config-scripts.sh
910

1011
## Unpack the source code.
11-
rm -Rf libogg-1.3.4 && tar xfvz ../archives/libogg-1.3.4.tar.gz && cd libogg-1.3.4
12+
rm -Rf ${LIBOGG}
13+
echo "Unpacking ${LIBOGG}"
14+
pv -pterab ../archives/${LIBOGG}.tar.gz | tar -xzf -
15+
cd ${LIBOGG}
1216

1317
## Replace config.guess and config.sub
1418
cp ../../archives/config.guess ../../archives/config.sub .

0 commit comments

Comments
 (0)