Attachment #137784 for bug #147042

Lines 307-314 Link Here

(-)build.definition.org (-2 / +2 lines)
307	#ADD_DEFINES = __JACK__	307	#ADD_DEFINES = __JACK__
308	#ADD_SOURCES = playerjack.cpp	308	#ADD_SOURCES = playerjack.cpp
309	#ADD_HEADERS = playerjack.h	309	#ADD_HEADERS = playerjack.h
310	OPTIONS = exit_on_failure	310	#OPTIONS = exit_on_failure
311	#OPTIONS = disable_feature	311	OPTIONS = disable_feature
312	#----------------------------------------------------------------------	312	#----------------------------------------------------------------------
313	# Check routines (DON'T TOUCH!)	313	# Check routines (DON'T TOUCH!)
314	include( check.qbas )	314	include( check.qbas )




	#macx:INCLUDEPATH += $$PORTAUDIO_DIR/pa_mac_core $$PORTAUDIO_DIR/pablio 
	
	#Hacked for PortAudio-v19
	unix:!macx:LIBS += -lportaudio -lrt
	#unix:!macx:LIBS += ../lib/portaudio-v19/lib/.libs/libportaudio.a -lasound -ljack -lrt
}


DBFILE = mixxx.db
LANGUAGE = C++

contains(ENABLED_FEATURES, alsa) {
	LIBS += -lasound
	DEFINES += __LINUX_ALSA__
}

contains(ENABLED_FEATURES, jack) {
	LIBS += -ljack
	DEFINES += __JACK__
}

contains(ENABLED_FEATURES, lua) {
	ENABLED_FEATURES += script
} else:contains(ENABLED_FEATURES, python) {

Return to bug 147042

Lines 55-61 Link Here

(-)/var/tmp/portage/media-sound/mixxx-1.5.0.1/work/mixxx-1.5.0/src/mixxx.pro (-1 / +11 lines)
55	#macx:INCLUDEPATH += $$PORTAUDIO_DIR/pa_mac_core $$PORTAUDIO_DIR/pablio	55	#macx:INCLUDEPATH += $$PORTAUDIO_DIR/pa_mac_core $$PORTAUDIO_DIR/pablio
56		56
57	#Hacked for PortAudio-v19	57	#Hacked for PortAudio-v19
58	unix:!macx:LIBS += -lportaudio -lasound -ljack -lrt	58	unix:!macx:LIBS += -lportaudio -lrt
59	#unix:!macx:LIBS += ../lib/portaudio-v19/lib/.libs/libportaudio.a -lasound -ljack -lrt	59	#unix:!macx:LIBS += ../lib/portaudio-v19/lib/.libs/libportaudio.a -lasound -ljack -lrt
60	}	60	}
61		61
Lines 466-471 Link Here
466	DBFILE = mixxx.db	466	DBFILE = mixxx.db
467	LANGUAGE = C++	467	LANGUAGE = C++
468		468
		469	contains(ENABLED_FEATURES, alsa) {
		470	LIBS += -lasound
		471	DEFINES += __LINUX_ALSA__
		472	}
		473
		474	contains(ENABLED_FEATURES, jack) {
		475	LIBS += -ljack
		476	DEFINES += __JACK__
		477	}
		478
469	contains(ENABLED_FEATURES, lua) {	479	contains(ENABLED_FEATURES, lua) {
470	ENABLED_FEATURES += script	480	ENABLED_FEATURES += script
471	} else:contains(ENABLED_FEATURES, python) {	481	} else:contains(ENABLED_FEATURES, python) {