Mercurial Mercurial > hg > gg-overlay / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gui-wm/hikari/files/hikari-2.2.1-pkgconfig.patch
author gabriel
Thu, 25 Mar 2021 16:06:38 +0000
changeset 28 590c5e157278
permissions -rw-r--r--
Patch for 2.2.2-r1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
28
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
     1
 
diff --git a/Makefile b/Makefile
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
     2
 
index 555b770..01025b9 100644
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
     3
 
--- a/Makefile
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
     4
 
+++ b/Makefile
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
     5
 
@@ -13,6 +13,7 @@ WITH_VIRTUAL_INPUT = YES
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
     6
 
 OS != uname
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
     7
 
 VERSION ?= "CURRENT"
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
     8
 
 PREFIX ?= /usr/local
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
     9
 
+PKG_CONFIG ?= pkg-config
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    10
 
 ETC_PREFIX ?= ${PREFIX}
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    11
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    12
 
 OBJS = \
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    13
 
@@ -78,7 +79,7 @@ OBJS += \
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    14
 
 	xwayland_view.o
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    15
 
 .endif
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    16
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    17
 
-WAYLAND_PROTOCOLS != pkg-config --variable pkgdatadir wayland-protocols
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    18
 
+WAYLAND_PROTOCOLS != ${PKG_CONFIG} --variable pkgdatadir wayland-protocols
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    19
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    20
 
 .PHONY: distclean clean clean-doc doc dist install uninstall
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    21
 
 .PATH: src
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    22
 
@@ -125,31 +126,31 @@ CFLAGS += -DHAVE_VIRTUAL_INPUT=1
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    23
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    24
 
 CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=${ETC_PREFIX}
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    25
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    26
 
-WLROOTS_CFLAGS != pkg-config --cflags wlroots
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    27
 
-WLROOTS_LIBS != pkg-config --libs wlroots
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    28
 
+WLROOTS_CFLAGS != ${PKG_CONFIG} --cflags wlroots
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    29
 
+WLROOTS_LIBS != ${PKG_CONFIG} --libs wlroots
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    30
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    31
 
 WLROOTS_CFLAGS += -DWLR_USE_UNSTABLE=1
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    32
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    33
 
-PANGO_CFLAGS != pkg-config --cflags pangocairo
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    34
 
-PANGO_LIBS != pkg-config --libs pangocairo
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    35
 
+PANGO_CFLAGS != ${PKG_CONFIG} --cflags pangocairo
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    36
 
+PANGO_LIBS != ${PKG_CONFIG} --libs pangocairo
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    37
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    38
 
-CAIRO_CFLAGS != pkg-config --cflags cairo
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    39
 
-CAIRO_LIBS != pkg-config --libs cairo
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    40
 
+CAIRO_CFLAGS != ${PKG_CONFIG} --cflags cairo
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    41
 
+CAIRO_LIBS != ${PKG_CONFIG} --libs cairo
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    42
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    43
 
-PIXMAN_CFLAGS != pkg-config --cflags pixman-1
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    44
 
-PIXMAN_LIBS != pkg-config --libs pixman-1
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    45
 
+PIXMAN_CFLAGS != ${PKG_CONFIG} --cflags pixman-1
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    46
 
+PIXMAN_LIBS != ${PKG_CONFIG} --libs pixman-1
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    47
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    48
 
-XKBCOMMON_CFLAGS != pkg-config --cflags xkbcommon
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    49
 
-XKBCOMMON_LIBS != pkg-config --libs xkbcommon
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    50
 
+XKBCOMMON_CFLAGS != ${PKG_CONFIG} --cflags xkbcommon
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    51
 
+XKBCOMMON_LIBS != ${PKG_CONFIG} --libs xkbcommon
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    52
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    53
 
-WAYLAND_CFLAGS != pkg-config --cflags wayland-server
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    54
 
-WAYLAND_LIBS != pkg-config --libs wayland-server
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    55
 
+WAYLAND_CFLAGS != ${PKG_CONFIG} --cflags wayland-server
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    56
 
+WAYLAND_LIBS != ${PKG_CONFIG} --libs wayland-server
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    57
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    58
 
-LIBINPUT_CFLAGS != pkg-config --cflags libinput
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    59
 
-LIBINPUT_LIBS != pkg-config --libs libinput
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    60
 
+LIBINPUT_CFLAGS != ${PKG_CONFIG} --cflags libinput
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    61
 
+LIBINPUT_LIBS != ${PKG_CONFIG} --libs libinput
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    62
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    63
 
-UCL_CFLAGS != pkg-config --cflags libucl
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    64
 
-UCL_LIBS != pkg-config --libs libucl
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    65
 
+UCL_CFLAGS != ${PKG_CONFIG} --cflags libucl
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    66
 
+UCL_LIBS != ${PKG_CONFIG} --libs libucl
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    67
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    68
 
 CFLAGS += \
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    69
 
 	${WLROOTS_CFLAGS} \
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    70
 
@@ -192,7 +193,7 @@ wlr-layer-shell-unstable-v1-protocol.h:
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    71
 
 	wayland-scanner server-header protocol/wlr-layer-shell-unstable-v1.xml ${.TARGET}
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    72
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    73
 
 hikari-unlocker: hikari_unlocker.c
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    74
 
-	${CC} ${CFLAGS_EXTRA} ${LDFLAGS_EXTRA} -o hikari-unlocker hikari_unlocker.c -lpam
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    75
 
+	${CC} ${LDFLAGS} ${CFLAGS} ${INCLUDES} -o hikari-unlocker hikari_unlocker.c -lpam
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    76
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    77
 
 clean-doc:
590c5e157278 Patch for 2.2.2-r1
gabriel
parents:
diff changeset 
    78
 
 	@test -e _darcs && echo "cleaning manpage" ||:
gg-overlay