Attachment #558142 for bug #673426

View | Details | Raw Unified | Return to bug 673426
Collapse All | Expand All




FFMPEG_LIBS += $(shell pkg-config --libs libswresample)

CMUS_LIBS = $(PTHREAD_LIBS) $(NCURSES_LIBS) $(ICONV_LIBS) $(DL_LIBS) $(DISCID_LIBS) \
			-lm $(COMPAT_LIBS) $(LOGIND_LIBS)

input.o main.o ui_curses.o op/pulse.lo: .version
input.o main.o ui_curses.o op/pulse.lo: CFLAGS += -DVERSION=\"$(VERSION)\"
main.o server.o: CFLAGS += -DDEFAULT_PORT=3000
discid.o: CFLAGS += $(DISCID_CFLAGS)
mpris.o: CFLAGS += $(LOGIND_CFLAGS)

.version: Makefile
	@test "`cat $@ 2> /dev/null`" = "$(VERSION)" && exit 0; \




	fi
}

check_logind()
{
	pkg_config LOGIND "libsystemd" || pkg_config LOGIND "libelogind >= 239.3"
	return $?
}


check check_mpc        CONFIG_MPC
check check_vorbis     CONFIG_VORBIS
check check_opus       CONFIG_OPUS
check check_logind     CONFIG_MPRIS
check check_wavpack    CONFIG_WAVPACK
check check_mp4        CONFIG_MP4
check check_aac        CONFIG_AAC

Return to bug 673426

Lines 246-254 check_vorbis() Link Here

(-)a/configure (-3 / +3 lines)
246	fi	246	fi
247	}	247	}
248		248
249	check_libsystemd()	249	check_logind()
250	{	250	{
251	pkg_config LIBSYSTEMD "libsystemd"	251	pkg_config LOGIND "libsystemd" \|\| pkg_config LOGIND "libelogind >= 239.3"
252	return $?	252	return $?
253	}	253	}
254		254
Lines 536-542 check check_modplug CONFIG_MODPLUG Link Here
536	check check_mpc CONFIG_MPC	536	check check_mpc CONFIG_MPC
537	check check_vorbis CONFIG_VORBIS	537	check check_vorbis CONFIG_VORBIS
538	check check_opus CONFIG_OPUS	538	check check_opus CONFIG_OPUS
539	check check_libsystemd CONFIG_MPRIS	539	check check_logind CONFIG_MPRIS
540	check check_wavpack CONFIG_WAVPACK	540	check check_wavpack CONFIG_WAVPACK
541	check check_mp4 CONFIG_MP4	541	check check_mp4 CONFIG_MP4
542	check check_aac CONFIG_AAC	542	check check_aac CONFIG_AAC

Lines 22-34 FFMPEG_CFLAGS += $(shell pkg-config --cflags libswresample) Link Here

(-)a/Makefile (-2 / +2 lines)
22	FFMPEG_LIBS += $(shell pkg-config --libs libswresample)	22	FFMPEG_LIBS += $(shell pkg-config --libs libswresample)
23		23
24	CMUS_LIBS = $(PTHREAD_LIBS) $(NCURSES_LIBS) $(ICONV_LIBS) $(DL_LIBS) $(DISCID_LIBS) \	24	CMUS_LIBS = $(PTHREAD_LIBS) $(NCURSES_LIBS) $(ICONV_LIBS) $(DL_LIBS) $(DISCID_LIBS) \
25	-lm $(COMPAT_LIBS) $(LIBSYSTEMD_LIBS)	25	-lm $(COMPAT_LIBS) $(LOGIND_LIBS)
26		26
27	input.o main.o ui_curses.o op/pulse.lo: .version	27	input.o main.o ui_curses.o op/pulse.lo: .version
28	input.o main.o ui_curses.o op/pulse.lo: CFLAGS += -DVERSION=\"$(VERSION)\"	28	input.o main.o ui_curses.o op/pulse.lo: CFLAGS += -DVERSION=\"$(VERSION)\"
29	main.o server.o: CFLAGS += -DDEFAULT_PORT=3000	29	main.o server.o: CFLAGS += -DDEFAULT_PORT=3000
30	discid.o: CFLAGS += $(DISCID_CFLAGS)	30	discid.o: CFLAGS += $(DISCID_CFLAGS)
31	mpris.o: CFLAGS += $(LIBSYSTEMD_CFLAGS)	31	mpris.o: CFLAGS += $(LOGIND_CFLAGS)
32		32
33	.version: Makefile	33	.version: Makefile
34	@test "`cat $@ 2> /dev/null`" = "$(VERSION)" && exit 0; \	34	@test "`cat $@ 2> /dev/null`" = "$(VERSION)" && exit 0; \