tjh.dev
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1diff -Naur --no-dereference ctx-source-old/configure.sh ctx-source-new/configure.sh
2--- ctx-source-old/configure.sh 1969-12-31 21:00:01.000000000 -0300
3+++ ctx-source-new/configure.sh 2023-09-27 19:26:05.403569888 -0300
4@@ -42,15 +42,18 @@
5 ENABLE_SWITCH_DISPATCH=1
6
7 pkg-config sdl2 && HAVE_SDL=1
8-pkg-config babl && HAVE_BABL=1
9+
10+pkg-config babl-0.1 && { HAVE_BABL=1; BABL_NAME=babl-0.1; }
11+if [ $HAVE_BABL != 1 ]; then
12+ pkg-config babl && { HAVE_BABL=1; BABL_NAME=babl; }
13+fi
14+
15 pkg-config libcurl && HAVE_LIBCURL=1
16 pkg-config alsa && HAVE_ALSA=1
17 pkg-config libdrm && HAVE_KMS=1
18 #pkg-config harfbuzz && HAVE_HARFBUZZ=1
19
20-
21-
22-ARCH=`uname -m`
23+: "${ARCH:="$(uname -m)"}"
24
25 case "$ARCH" in
26 "x86_64") HAVE_SIMD=1 ;;
27@@ -224,8 +227,8 @@
28 if [ $HAVE_BABL = 1 ];then
29 echo "#define CTX_BABL 1 " >> local.conf
30 echo "#define CTX_ENABLE_CM 1 " >> local.conf
31- echo "CTX_CFLAGS+= `pkg-config babl --cflags`" >> build.conf
32- echo "CTX_LIBS+= `pkg-config babl --libs` " >> build.conf
33+ echo "CTX_CFLAGS+= `pkg-config "${BABL_NAME}" --cflags`" >> build.conf
34+ echo "CTX_LIBS+= `pkg-config "${BABL_NAME}" --libs` " >> build.conf
35 else
36 echo "#define CTX_BABL 0 " >> local.conf
37 echo "#define CTX_ENABLE_CM 0 " >> local.conf
38@@ -335,7 +338,7 @@
39 #echo "Generating build.deps"
40 #make build.deps 2>/dev/null
41
42-echo -n "configuration summary, architecture $(arch)"
43+echo -n "configuration summary, architecture $ARCH"
44 [ $HAVE_SIMD = 1 ] && echo " SIMD multi-pass"
45 echo ""
46 echo "Backends:"
47diff -Naur --no-dereference ctx-source-old/Makefile ctx-source-new/Makefile
48--- ctx-source-old/Makefile 1969-12-31 21:00:01.000000000 -0300
49+++ ctx-source-new/Makefile 2023-09-27 19:37:23.779830320 -0300
50@@ -206,8 +206,8 @@
51 libctx.a: itk.o deps.o $(CTX_OBJS) build.conf Makefile
52 $(AR) rcs $@ $(CTX_OBJS) deps.o itk.o
53 libctx.so: $(CTX_OBJS) deps.o itk.o build.conf Makefile
54- $(LD) -shared $(LIBS) $(CTX_OBJS) deps.o itk.o $(CTX_LIBS) -o $@
55- #$(LD) --retain-symbols-file=symbols -shared $(LIBS) $? $(CTX_LIBS) -o $@
56+ $(CCC) -shared $(LIBS) $(CTX_OBJS) deps.o itk.o $(CTX_LIBS) -o $@
57+ #$(CCC) --retain-symbols-file=symbols -shared $(LIBS) $? $(CTX_LIBS) -o $@
58
59 ctx: main.c ctx.h build.conf Makefile $(TERMINAL_OBJS) $(MEDIA_HANDLERS_OBJS) libctx.a
60 $(CCC) main.c $(TERMINAL_OBJS) $(MEDIA_HANDLERS_OBJS) -o $@ $(CFLAGS) libctx.a $(LIBS) $(CTX_CFLAGS) $(OFLAGS_LIGHT) -lpthread $(CTX_LIBS)
61@@ -277,5 +277,5 @@
62 for a in `cat itk/css.h | tr ';' ' ' | tr ',' ' ' | tr ')' ' '|tr ':' ' ' | tr '{' ' ' | tr ' ' '\n' | grep 'SQZ_[a-z][0-9a-zA-Z_]*'| sort | uniq`;do b=`echo $$a|tail -c+5|tr '_' '-'`;echo "#define $$a `./squoze/squoze -33 $$b`u // \"$$b\"";done \
63 >> $@
64 echo '#endif' >> $@
65-static.inc: static/* static/*/* tools/gen_fs.sh
66+static.inc: static/* tools/gen_fs.sh
67 ./tools/gen_fs.sh static > $@