Commit graph

149 commits

Author SHA1 Message Date
Simon Howard
93a98c863f Update dev branch for SDL2 projects.
SDL has now moved on to development of SDL3 and for now we want to
keep building SDL2.
2023-05-14 12:15:00 -04:00
Simon Howard
5ee57f8067 Updates for emscripten package 2022-05-17 00:14:22 -04:00
Simon Howard
4f25e8759a Use /usr/bin/env for bash.
Some systems like BSDs install it in /usr/local.
2022-05-10 00:25:39 -04:00
Simon Howard
d8e3beaaa6 Change SDL packages to git, ditch Mercurial module. 2022-05-10 00:12:49 -04:00
Simon Howard
42fcac5659 Allow switching between branches and support tags. 2022-05-10 00:10:22 -04:00
Simon Howard
2b701b84c1 Add package definition for SDL Sopwith.
Okay, not really Chocolate Doom related, but this is for my own
convenience.
2022-04-29 00:24:02 -04:00
Simon Howard
fb39b5b48c
Merge pull request #20 from chocolate-doom/mpg123-1.26
Update libmpg123 to v1.26.3
2020-07-22 12:55:10 -04:00
Fabian Greffrath
9279913fd9 Update libmpg123 to v1.26.3 2020-07-22 12:15:24 +02:00
Simon Howard
6aac1d9032 Don't build libFLAC++
We don't need it and it's causing problems for macOS build.
2020-06-25 00:01:26 -04:00
Simon Howard
f4f03c4223 Bump stable version to 3.0.1 2020-06-24 23:26:48 -04:00
Fabian Greffrath
5cb9a3c50d Update libmpg123 to v1.26.1 2020-06-19 13:40:22 +02:00
Simon Howard
8fea99baa2 Use gmake over make if it is installed.
BSD systems install GNU make as `gmake` along with their own less-
capable version of make as `make`. If `gmake` is found to be installed,
prefer it because the BSD makes don't often work as expected.
2020-05-16 17:18:09 -04:00
Simon Howard
cf5290d208 Add support for BSD sha256 command.
OpenBSD has this instead of shasum/sha256sum; apparently FreeBSD too.
2020-05-16 17:09:32 -04:00
Simon Howard
8fb2d1ea58 Use tar -f - to read from stdin.
Not all implementations of tar assume reads from stdin if no filename
is given. Fixes extracts on OpenBSD.
2020-05-16 17:05:50 -04:00
Simon Howard
8782712aaf Add support for decompressing .bz2 files.
This should resolve the blocking issue with libmpg321 which is distributed
in .tar.bz2 format.
2020-04-10 20:02:09 -04:00
Simon Howard
e13fe8f8c5
Merge pull request #18 from chocolate-doom/mpg123-1.25.13
Mpg123 1.25.13
2020-04-03 12:34:19 -04:00
Simon Howard
a2f244b457
Merge pull request #17 from chocolate-doom/SDL2-2.0.12
Bump SDL to v2.0.12.
2020-04-03 12:33:59 -04:00
Fabian Greffrath
2a077082e8 Let SDL2_Mixer prefer libmpg123 over libmad. 2020-04-03 12:34:43 +02:00
Fabian Greffrath
59d6d86266 Add libmpg123 package for better MP3 support. 2020-04-03 12:32:10 +02:00
Fabian Greffrath
5827634065 Bump SDL to v2.0.12. 2020-04-03 12:06:57 +02:00
fx02
d9b2e453c6 Competition Doom package v3. 2019-08-09 21:08:47 +02:00
Simon Howard
f2e11960cd
Merge pull request #16 from chocolate-doom/sdl2_2-0-10
Bump SDL to v2.0.10.
2019-07-29 09:50:14 -04:00
Fabian Greffrath
e5477f6756 Bump SDL to v2.0.10. 2019-07-29 09:54:46 +02:00
Simon Howard
5059bee493 Bump SDL to v2.0.9.
Context is in chocolate-doom/chocolate-doom#1147
2019-03-08 21:57:37 -05:00
Simon Howard
6cc0fc095c Change URLs to point at chocpkg-mirrors repo.
Instead of the /depends/ directory on chocolate-doom.org which nobody
except me can edit. Also define a variable to define the base URL for
the mirrors repo so that we can update it easily when GitHub change
their URLs.
2019-03-03 00:14:41 -05:00
Simon Howard
151544f82f Bump SDL2 versions to more recent.
libmad integration crashes on macOS with older versions of SDL2_mixer,
but v2.0.4 has fixes for this.
2019-03-02 12:42:40 -05:00
Simon Howard
3f9324e6aa Update URL for libogg. 2019-03-02 11:32:24 -05:00
Simon Howard
5413c35704 Update libmad pkgdef to use Git repo.
Fabian set up a repository with all the patches to get libmad running on
modern systems, so use that.
2019-02-28 21:09:47 -05:00
Simon Howard
4b8cce8a91 Fix library installed check.
Output cannot be truncated. Also suppress error output from gcc.
2019-01-20 16:29:09 -05:00
Simon Howard
adcff97ec8 Merge branch 'master' of github.com:chocolate-doom/chocpkg 2019-01-20 16:12:46 -05:00
Simon Howard
fd46edf258 Add libmad package for MP3 support.
At request of Fabian.
2019-01-20 16:11:56 -05:00
Simon Howard
1cca6143f5 Add new module to check if a library is installed.
This is very suboptimal compared to using pkg-config, but there are
still some libraries which don't install pkg-config files.
2019-01-20 16:04:32 -05:00
Simon Howard
10c2d1ee65 Don't cd to source emsdk script. 2018-10-01 21:48:53 -04:00
Simon Howard
dc09426790 Create directory if it doesn't exist. 2018-10-01 21:46:27 -04:00
Simon Howard
b35fd59962 SDL2: Disable assembly for Emscripten build.
This causes errors / warnings related to SIMD and the SDL2 docs say
to disable it.
2018-09-30 23:36:35 -04:00
Simon Howard
496844a0da Change to -local- build host type.
Switch from asmjs-unknown-emscripten for Emscripten builds to using
asmjs-local-emscripten instead. The config.sub script doesn't recognize
the emscripten "CPU type" and throws an error, but changing to *-local-*
instead overrides its normal checks.
2018-09-30 22:40:43 -04:00
Simon Howard
e8b49319b7 Add initial package for Emscripten builds.
This wraps up the Emscripten setup process as a chocpkg pkgdef. We
"install" it by creating wrapper scripts for all the necessary compile
tools.
2018-09-30 22:03:34 -04:00
Simon Howard
f8ff071967 Set up build environment before install step.
This call sets various environment variables (including PATH) before
install; it's important this happens here as well as for build, because
the install step may require tools installed in the install.native
directory.
2018-09-30 21:36:27 -04:00
Simon Howard
bd39ce52f6 Don't add Mac parameters when cross-compiling. 2018-09-30 21:34:57 -04:00
Simon Howard
0013d1623c Update URL for libvorbis package. 2018-01-03 23:43:37 +01:00
Simon Howard
65408693f3 Build stable chocolate-doom, not latest.
This is no longer necessary now that the first sdl2-branch release
has been made.
2018-01-03 23:18:51 +01:00
Simon Howard
a12fd67029 Fix bug with installed check after install.
Since the working directory can be changed it is not valid to use
$0 to reinvoke the script. This fixes #14 - thanks to @KingOfPoptart
for the bug report.
2018-01-03 23:08:18 +01:00
Simon Howard
cb78e9b54a Parse buildenv.sh after commands.sh.
The ordering here is important, otherwise the Linux path in buildenv.sh
tries to use the INSTALL_DIR variable and fails.

This fixes #15. Thanks @cvanderw for the report.
2018-01-03 22:43:39 +01:00
Simon Howard
5891dc3b60 sdl2-branch has now been merged to master. 2017-12-30 23:03:47 +01:00
Simon Howard
9e8db54601 Bump stable version to 3.0.0. 2017-12-30 22:31:51 +01:00
Simon Howard
b11394e617 Add crispy-doom package.
Crispy Doom is now based on sdl2-branch, so add it to chocpkg.
2017-10-11 22:10:19 -04:00
Simon Howard
d1a4e320d5 Double check package is installed after 'install'.
If a package is not defined correctly (eg. wrong pkg-config name),
chocpkg might not recognize a package is installed even after we've
gone through the entire build and install step. So print a message if
'chocpkg installed' still evaluates to false after install.
2017-02-21 22:50:42 -05:00
Simon Howard
3e5b47e802 Fix pkgconfig name for glib. 2017-02-21 22:33:44 -05:00
Simon Howard
900610a0ac Add --ff-only to git pull command.
Don't make or commit merges when running 'git pull' - the assumption
is that we're tracking an upstream branch that should always be
possible to fast-forward. Better to fail with an error if we can't
do this and allow the user to intervene to resolve the problem.
2017-02-19 17:12:31 -05:00
Simon Howard
840683540e Add 'latest' build variants for several libraries. 2017-02-18 21:07:35 -05:00