forked from Lainports/freebsd-ports
c286664d47
Remove the GSTREAMER and VLC options. GStreamer is now the only supported backend. Convert the TEST option to the CMake testing framework. https://github.com/strawberrymusicplayer/strawberry/releases/tag/1.2.1 https://github.com/strawberrymusicplayer/strawberry/releases/tag/1.2.2
25 lines
589 B
C
25 lines
589 B
C
Fix conflicting definitions of NULL beween glib and cdio when CDIO option
|
|
is enabled.
|
|
|
|
https://github.com/strawberrymusicplayer/strawberry/issues/1610
|
|
|
|
--- src/device/cddadevice.h.orig 2024-11-23 16:55:49 UTC
|
|
+++ src/device/cddadevice.h
|
|
@@ -24,13 +24,14 @@
|
|
|
|
#include "config.h"
|
|
|
|
-#include <cdio/cdio.h>
|
|
-#include <gst/audio/gstaudiocdsrc.h>
|
|
-
|
|
#include <QObject>
|
|
#include <QString>
|
|
#include <QStringList>
|
|
#include <QUrl>
|
|
+
|
|
+// These must come after Qt includes
|
|
+#include <cdio/cdio.h>
|
|
+#include <gst/audio/gstaudiocdsrc.h>
|
|
|
|
#include "includes/shared_ptr.h"
|
|
#include "core/song.h"
|