wip

Author: mxcl

.github/Dockerfile

@@ -3,7 +3,7 @@ RUN apt-get update && apt-get install -y curl
 RUN curl https://pkgx.sh/$(uname)/$(uname -m).tgz | tar xz -C /usr/local/bin
 
 ENV PKGX_DIST_URL="https://dist.pkgx.dev/v2"
-RUN pkgx +llvm.org +patchelf +deno^2 +gnu.org/gcc/libstdcxx@14
+RUN pkgx +llvm.org +patchelf +deno^2 +gnu.org/gcc/libstdcxx^14
 COPY ./brewkit /work/brewkit
 COPY ./.github /work/.github
 COPY ./deno.jsonc /work/deno.jsonc

projects/ffmpeg.org/package.yml

@@ -10,7 +10,7 @@ dependencies:
   sf.net/lame: '>=3.98.3'
   # libsdl.org: ^2
   freetype.org: ^2
-  # harfbuzz.org: ^8
+  harfbuzz.org: ^8
   videolan.org/x264: ^0.165
   videolan.org/x265: ^4
   google.com/libvpx: ^1

projects/imagemagick.org/build.ts

@@ -1,24 +1,15 @@
 import { BuildOptions, unarchive, run, inreplace } from "brewkit";
+import env_include from "../../brewkit/env-include.ts";
 
 export default async function ({ prefix, tag, version }: BuildOptions) {
   await unarchive(`https://github.com/ImageMagick/ImageMagick/archive/${tag}.tar.gz`);
 
   // we use the DESTDIR trick or the install fails due to trying to write to /etc
   // (despite the fact `--enable-zero-configuration` embeds them in the binaries)
-  Deno.env.set("DESTDIR", prefix.parent().parent().string);
-
-  let extra = '';
-  if (Deno.build.os == "darwin") {
-    // stolen from the Honebrew formula
-    extra = `
-      "ac_cv_prog_c_openmp=-Xpreprocessor -fopenmp"
-      "ac_cv_prog_cxx_openmp=-Xpreprocessor -fopenmp"
-      LDFLAGS=-lomp
-    `;
-  }
+  Deno.env.set("DESTDIR", prefix.string);
 
   run`./configure
-        --prefix=/imagemagick.org/v${version}
+        --prefix=/usr/local
         --disable-debug
         --sysconfdir=/etc
         --enable-osx-universal-binary=no
@@ -51,6 +42,11 @@ export default async function ({ prefix, tag, version }: BuildOptions) {
 
   run`make --jobs ${navigator.hardwareConcurrency} install`;
 
+  for await (const [path] of prefix.join("usr/local").ls()) {
+    path.mv({ into: prefix });
+  }
+  prefix.join("usr/local").rm().parent().rm();
+
   for (const x of ["Magick++", "MagickCore", "MagickWand"]) {
     const fn = prefix.bin.join(`${x}-config`);
     inreplace(

projects/imagemagick.org/package.yml

@@ -43,14 +43,17 @@ dependencies:
   jpeg.org/jpegxl: ^0.11
   github.com/strukturag/libheif: ^1
   libzip.org: ^1.11
-  llvm.org/openmp: ^20
 
 linux:
   dependencies:
     gnu.org/gcc/libstdcxx: ^14
     sourceware.org/bzip2: ^1
     zlib.net: ^1
     x.org/libx11: ^1
+    llvm.org/openmp: ^20
+    # ^^ TODO we want this on darwin too but we need to make our own llvm work
+    # because the Apple provided one does not support `-fopenmp`
+
 
 env:
   MAGICK_HOME: '{{prefix}}'

projects/libsdl.org/build.ts

@@ -0,0 +1,29 @@
+import { BuildOptions, unarchive, run, env_include } from "brewkit";
+
+export default async function ({ prefix, version, deps, tag, props }: BuildOptions) {
+  await unarchive(`https://github.com/libsdl-org/SDL/archive/refs/tags/release-${version}.tar.gz`);
+
+  if (Deno.build.os === "linux") {
+    env_include("x.org/protocol x.org/util-macros");
+  }
+
+  run`cmake
+        -B bld
+        -DCMAKE_INSTALL_PREFIX=${prefix}
+        -Wno-dev
+        -DSDL_INSTALL=ON
+        -DSDL_HIDAPI=ON
+        -DSDL_PULSEAUDIO=ON
+        -DSDL_PULSEAUDIO_SHARED=ON
+        -DSDL_DUMMYVIDEO=ON
+        -DSDL_OPENGL=ON
+        -DSDL_OPENGLES=ON
+        -DSDL_X11=ON
+        -DSDL_X11_XSCRNSAVER=ON
+        -DSDL_X11_XCURSOR=ON
+        -DSDL_X11_XINPUT=ON
+        -DSDL_X11_XRANDR=ON
+        -DSDL_X11_XSHAPE=ON
+        -DSDL_X11_SHARED=ON`;
+    run`cmake --build bld --target install`;
+}

projects/libsdl.org/package.yml

@@ -0,0 +1,20 @@
+repository:
+  https://github.com/libsdl-org/SDL
+
+platforms:
+  - darwin/aarch64
+  - linux/x86-64
+
+linux:
+  dependencies:
+    x.org/libx11: '*'
+    # x.org/xcursor: '*'
+    # x.org/xi: '*'
+    # x.org/xrandr: '*'
+    # x.org/xfixes: '*'
+    # x.org/xrender: '*'
+    # x.org/xscrnsaver: '*'
+    # x.org/exts: '*'
+
+env:
+  CPATH: '{{prefix}}/include{{version.major}}:$CPATH'

projects/libsdl.org/test.c

@@ -0,0 +1,6 @@
+#include <SDL.h>
+int main() {
+  SDL_Init(SDL_INIT_VIDEO);
+  SDL_Quit();
+  return 0;
+}

projects/libsdl.org/test.ts

@@ -0,0 +1,6 @@
+import { run, TestOptions } from "brewkit";
+
+export default async function ({version}: TestOptions) {
+  run`cc test.c -lSDL${version.major}`;
+  run`./a.out`;
+}

projects/llvm.org/package.yml

@@ -41,7 +41,6 @@ linux:
     zlib.net: ^1
     gnu.org/gcc/libstdcxx: ^14
 
-# works on all platforms but is very slow to build
-# and we only *need* it on Linux
 platforms:
+  - darwin/aarch64
   - linux/x86-64

projects/x.org/libx11/versions.ts

@@ -1,15 +1,5 @@
-import { SemVer } from "brewkit";
+import versions from '../versions.ts';
 
 export default async function() {
-  const rsp = await fetch('https://www.x.org/archive/individual/lib/');
-  const txt = await rsp.text();
-  const matches = txt.matchAll(/libX11-(\d+(\.\d+)+)\.tar\.gz/g);
-  const rv = []
-  for (const m of matches) {
-    rv.push({
-      tag: m[1],
-      version: new SemVer(m[1])
-    });
-  }
-  return rv;
+  return versions('libX11');
 }