Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 334821 | Differences between
and this patch

Collapse All | Expand All

(-)libraw-config (-3 / +3 lines)
Lines 30-36 Link Here
30
}
30
}
31
31
32
cflags() {
32
cflags() {
33
    if pkg-config --silence-errors --cflags libraw; then
33
    if pkg-config --silence-errors --cflags libraw_r; then
34
        :
34
        :
35
    elif [ $1 ]; then
35
    elif [ $1 ]; then
36
        printf "%cDLIBRAW_NODLL " "-"
36
        printf "%cDLIBRAW_NODLL " "-"
Lines 42-48 Link Here
42
}
42
}
43
43
44
libs() {
44
libs() {
45
    if pkg-config --silence-errors --libs libraw; then
45
    if pkg-config --silence-errors --libs libraw_r; then
46
        :
46
        :
47
    elif [ $1 ]; then
47
    elif [ $1 ]; then
48
        printf "%clraw_r %clstdc++ %clwsock32 " "-" "-" "-"
48
        printf "%clraw_r %clstdc++ %clwsock32 " "-" "-" "-"
Lines 55-61 Link Here
55
55
56
# TODO: Cannot check version of library if no .pc file installed.
56
# TODO: Cannot check version of library if no .pc file installed.
57
exists() {
57
exists() {
58
    if pkg-config --silence-errors --exists 'libraw >= $3'; then
58
    if pkg-config --silence-errors --exists 'libraw_r >= $3'; then
59
        :
59
        :
60
    elif ! searchpath $LIB_DIRS "libraw_r.a" || ! searchpath $HEADER_DIRS "libraw/libraw.h"; then
60
    elif ! searchpath $LIB_DIRS "libraw_r.a" || ! searchpath $HEADER_DIRS "libraw/libraw.h"; then
61
        printf "\nPackage libraw not found\n"
61
        printf "\nPackage libraw not found\n"
(-)Makefile (-2 / +7 lines)
Lines 135-141 Link Here
135
	FixedKeyFile.vapi \
135
	FixedKeyFile.vapi \
136
	ExtendedPosix.vapi \
136
	ExtendedPosix.vapi \
137
	LConv.vapi \
137
	LConv.vapi \
138
	libraw.vapi \
138
	libraw_r.vapi \
139
	gdk-none.vapi
139
	gdk-none.vapi
140
140
141
RESOURCE_FILES = \
141
RESOURCE_FILES = \
Lines 271-277 Link Here
271
	gexiv2
271
	gexiv2
272
272
273
LIBRAW_PKG = \
273
LIBRAW_PKG = \
274
	libraw
274
	libraw_r
275
275
276
ifdef LINUX
276
ifdef LINUX
277
EXT_PKGS += \
277
EXT_PKGS += \
Lines 391-396 Link Here
391
LIBRAW_CONFIG=./libraw-config
391
LIBRAW_CONFIG=./libraw-config
392
endif
392
endif
393
393
394
# If libraw is built with OpenMP support, we'll need this.
395
ifneq (,$(findstring fopenmp,$(shell ./libraw-config --cflags)))
396
	CFLAGS += -fopenmp
397
endif
398
394
ifdef WINDOWS
399
ifdef WINDOWS
395
LIBRAW_CONFIG=./libraw-config --windows
400
LIBRAW_CONFIG=./libraw-config --windows
396
endif
401
endif

Return to bug 334821