ports

commit 8efd1e67a063ee2d0f7cd2da3b81ce80ce322bec
parent 6a6922bd71f3e17dc6e7bbaeaf2c212379dd4fcb
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date:   Mon, 21 Jul 2014 20:26:47 +0000

add meh, improve libjpegturbo

Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>

Diffstat:
M
libjpegturbo/libjpegturbo.mk
 | 
14
+++++++++++---
A
meh/meh.mk
 | 
19
+++++++++++++++++++
A
meh/mkfile
 | 
6
++++++
A
meh/v.mk
 | 
1
+

4 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/libjpegturbo/libjpegturbo.mk b/libjpegturbo/libjpegturbo.mk
@@ -12,14 +12,22 @@ libjpegturbo_a_OBJ = \
 	jddctmgr.o jdhuff.o jdinput.o jdmainct.o jdmarker.o jdmaster.o \
 	jdmerge.o jdphuff.o jdpostct.o jdsample.o jdtrans.o jerror.o \
 	jfdctflt.o jfdctfst.o jfdctint.o jidctflt.o jidctfst.o jidctint.o \
-	jidctred.o jquant1.o jquant2.o jutils.o jmemmgr.o jmemnobs.o
+	jidctred.o jquant1.o jquant2.o jutils.o jmemmgr.o jmemnobs.o \
+	jcarith.o jdarith.o jsimd_none.o rdswitch.o cdjpeg.o transupp.o \
+	jaricom.o
 
-jpegtran_OBJ = jpegtran.o rdswitch.o cdjpeg.o transupp.o \
-	jcarith.o jdarith.o jaricom.o
+jpegtran_OBJ = jpegtran.o
 jpegtran_LDFLAGS = -L. -ljpegturbo
 
+DEPS_CFLAGS =
+DEPS_LDFLAGS =
+LOCAL_CFLAGS =
+LOCAL_LDFLAGS =
+LOCAL_BIN_LDFLAGS =
+
 <$mkbuild/mk.default
 
+$jpegtran_OBJ: $LIB libjpegsymlink
 $libjpegturbo_a_OBJ: jconfig.h config.h libjpegsymlink
 
 # makes sure -ljpeg works.
diff --git a/meh/meh.mk b/meh/meh.mk
@@ -0,0 +1,19 @@
+BIN = src/meh
+DEPS = xorglibx11 xorglibxcb xorglibxdmcp xorglibxau xorglibxext \
+	xorgprotoall libgiflib libjpegturbo libpng zlib
+INSTALL_BIN = src/meh
+INSTALL_MAN1 = doc/meh.1
+src_meh_OBJ = `{ls -1 src/*.c | sed 's/.$/o/'}
+src_meh_LDFLAGS =
+LOCAL_CFLAGS =
+LOCAL_LDFLAGS =
+LOCAL_BIN_LDFLAGS =
+
+<$mkbuild/mk.common
+
+$src_meh_OBJ: prepare
+
+prepare:V:
+	# fix include.
+	grep -q 'X11/Xlib.h' src/meh.h || \
+		sed -i -E 's@^(#include <stdio.h>)@\1\n#include <X11/Xlib.h>@g' src/meh.h
diff --git a/meh/mkfile b/meh/mkfile
@@ -0,0 +1,6 @@
+<$mkbuild/mk.3rdparty
+
+<v.mk
+src = meh
+git = https://github.com/jhawthorn/meh/
+mkfile = ../meh.mk
diff --git a/meh/v.mk b/meh/v.mk
@@ -0,0 +1 @@
+v = git