Commit graph

130 commits

Author SHA1 Message Date
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
Simon Howard
1f2c3eb9e9 Add 3.0.0-beta1 as stable release. 2017-02-03 20:18:59 -05:00
Simon Howard
47ba2e79ef Merge pull request #12 from chungy/master
Update SDL to 2.0.5.
2017-01-26 14:08:24 -05:00
Mike Swanson
612db67c95 Update SDL to 2.0.5. 2017-01-26 10:47:01 -08:00
Simon Howard
a34f86ffb4 Use /fossils/ directory from zlib.net for download.
The current download URL linked from the front page is unstable, since
it breaks every time a new release is put out. Instead, link to the
/fossils/ directory, which contains all old releases as well as the
current release.
2017-01-22 22:58:29 +00:00
Simon Howard
4cb0fd1cd7 Update zlib to 1.2.11. 2017-01-22 22:33:01 +00:00
Simon Howard
09d1177b01 Pass -static-libgcc via CC instead of LDFLAGS.
Using LDFLAGS ought to work, but libtool strips it out when compiling,
so it doesn't. Instead, set the CC variable so that it is always used.
This fixes the dependency on the libgcc DLL on Windows.
2017-01-16 00:55:51 +00:00
Simon Howard
a5173416e2 Build zlib dynamic, not static.
This should fix MingW compiles. Disable '-lc' on the linker command
line since this breaks compilation on Windows and shouldn't be
necessary anyway.
2017-01-15 00:46:45 +00:00
Simon Howard
9a1086d773 Add libogg as flac package dependency.
It does appear to need this to compile.
2017-01-15 00:40:49 +00:00
Simon Howard
1e478f8cb3 Add -static-libgcc to LDFLAGS on Windows builds.
This is needed to avoid adding a dependency on libgcc_s_sjlj-1.dll.
2017-01-08 21:36:25 +01:00
Simon Howard
40f576b7b9 Remove dependencies hook.
The package group version of this function is identical to the normal
command, so it isn't necessary. Plus it's not clear that there's a
need for a hook on the dependencies command.
2017-01-08 01:41:38 +01:00
Simon Howard
3353c13d83 Fix package groups. 2017-01-08 01:35:50 +01:00
Simon Howard
fa1e1d06ce Be more careful when recursing.
It's not enough to pass $PACKAGE_NAME when recursing to invoke a
subcommand. Since PACKAGE_NAME now just includes the base package
name with no qualifiers, the type and variant will be lost. Instead,
be more explicit about always passing a fully-qualified name to the
sub-process.
2017-01-08 01:06:52 +01:00
Simon Howard
53adbfe9ec Namespace module functions. 2017-01-08 00:56:32 +01:00
Simon Howard
cf43367402 Namespace functions.sh.
Rename some of these functions in the process.
2017-01-08 00:53:52 +01:00
Simon Howard
3b51b90ffd Fix help when no command provided. 2017-01-08 00:45:54 +01:00
Simon Howard
c513f4246c Rename check_installed -> do_check for consistency.
All other module functions are named do_* so it seems odd to have the
check modules be different.
2017-01-08 00:41:12 +01:00
Simon Howard
d77144fe44 Factor out command-related code.
This leaves the main script as a small stub that just invokes the
chocpkg::commands::command function.
2017-01-08 00:38:03 +01:00
Simon Howard
6827998f01 Update zlib to 1.2.10. 2017-01-08 00:37:35 +01:00
Simon Howard
c3cf517add Move recursion function to functions.sh.
This is used by enough stuff that it needs to be a common function.
2017-01-08 00:30:20 +01:00