Building with fdk-aac.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 17 insertions, 17 deletions

diff --git a/debian/control b/debian/control
index cf17065..e66d1fe 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: pipewire
-Section: libs
+Section: non-free/libs
 Priority: optional
 Maintainer: Progress Linux Maintainers <maintainers@lists.progress-linux.org>
 XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
@@ -15,6 +15,7 @@ Build-Depends: debhelper-compat (= 13),
                libbluetooth-dev,
                libcamera-dev (>= 0.0.1) [!m68k],
                libdbus-1-dev,
+               libfdk-aac-dev,
                libfreeaptx-dev,
                libglib2.0-dev,
                libgstreamer-plugins-base1.0-dev,
@@ -43,8 +44,7 @@ Build-Depends: debhelper-compat (= 13),
                modemmanager-dev,
                pkg-config,
                python3-docutils,
-               systemd [linux-any]
-Build-Conflicts: libfdk-aac-dev
+               systemd [linux-any],
 Standards-Version: 4.6.2
 Vcs-Browser: https://git.progress-linux.org/packages/graograman/pipewire
 Vcs-Git: https://git.progress-linux.org/packages/graograman/pipewire
@@ -87,7 +87,7 @@ Description: libraries for the PipeWire multimedia server - common files
  languages other than English.
 
 Package: libpipewire-0.3-dev
-Section: libdevel
+Section: non-free/libdevel
 Architecture: linux-any
 Multi-Arch: same
 Depends: libpipewire-0.3-0 (= ${binary:Version}),
@@ -142,7 +142,7 @@ Description: libraries for the PipeWire multimedia server - X11 modules
  This package contains X11 modules.
 
 Package: libspa-0.2-dev
-Section: libdevel
+Section: non-free/libdevel
 Architecture: linux-any
 Multi-Arch: same
 Depends: ${misc:Depends}
@@ -179,7 +179,7 @@ Description: libraries for the PipeWire multimedia server Simple Plugin API - mo
  clients should depend on the pipewire package instead.
 
 Package: pipewire-doc
-Section: doc
+Section: non-free/doc
 Build-Profiles: <!nodoc>
 Architecture: all
 Multi-Arch: foreign
@@ -198,7 +198,7 @@ Description: libraries for the PipeWire multimedia server - documentation
  This package contains the API reference.
 
 Package: pipewire
-Section: video
+Section: non-free/video
 Architecture: linux-any
 Multi-Arch: same
 Depends: libpipewire-0.3-modules (= ${binary:Version}),
@@ -220,7 +220,7 @@ Description: audio and video processing engine multimedia server
  pipewire on-demand.
 
 Package: pipewire-bin
-Section: video
+Section: non-free/video
 Architecture: linux-any
 Multi-Arch: foreign
 Depends: libpipewire-0.3-modules (= ${binary:Version}),
@@ -245,7 +245,7 @@ Description: PipeWire multimedia server - programs
  the pipewire package instead.
 
 Package: pipewire-pulse
-Section: sound
+Section: non-free/sound
 Architecture: linux-any
 Multi-Arch: foreign
 Replaces: pipewire-bin (<< 0.3.27-2)
@@ -268,7 +268,7 @@ Description: PipeWire PulseAudio daemon
  This package contains the PulseAudio replacement daemon.
 
 Package: pipewire-alsa
-Section: sound
+Section: non-free/sound
 Architecture: linux-any
 Multi-Arch: same
 Replaces: pipewire-audio-client-libraries (<< 0.3.54-1~)
@@ -289,7 +289,7 @@ Description: PipeWire ALSA plugin
  This package contains the ALSA plugin.
 
 Package: pipewire-jack
-Section: sound
+Section: non-free/sound
 Architecture: linux-any
 Multi-Arch: same
 Replaces: pipewire-audio-client-libraries (<< 0.3.54-1~)
@@ -309,7 +309,7 @@ Description: PipeWire JACK plugin
  This package contains the JACK plugin.
 
 Package: pipewire-v4l2
-Section: video
+Section: non-free/video
 Architecture: linux-any
 Multi-Arch: same
 Replaces: pipewire-bin (<< 0.3.54-1),
@@ -331,7 +331,7 @@ Description: PipeWire V4L2 plugin
  This package contains the V4L2 plugin.
 
 Package: pipewire-libcamera
-Section: video
+Section: non-free/video
 Architecture: amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x alpha hppa ia64 powerpc ppc64 riscv64 sh4 sparc64 x32
 Multi-Arch: same
 Depends: pipewire (= ${binary:Version}),
@@ -351,7 +351,7 @@ Description: PipeWire libcamera plugin
 Package: pipewire-tests
 Architecture: linux-any
 Depends: pipewire (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Section: misc
+Section: non-free/misc
 Description: PipeWire multimedia server - tests and examples
  PipeWire is a server and user space API to deal with multimedia
  pipelines. This includes:
@@ -416,7 +416,7 @@ Description: libraries for the PipeWire multimedia server - JACK client
  JACK server, which will be used for audio playback and recording.
 
 Package: pipewire-audio-client-libraries
-Section: oldlibs
+Section: non-free/oldlibs
 Architecture: all
 Depends: pipewire-alsa,
          pipewire-jack,
@@ -429,7 +429,7 @@ Description: transitional package for pipewire-alsa and pipewire-jack
  It can safely be removed.
 
 Package: pipewire-audio
-Section: sound
+Section: non-free/sound
 Architecture: all
 Depends: ${misc:Depends},
          libspa-0.2-bluetooth,
diff --git a/debian/rules b/debian/rules
index ce46971..eea5c22 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,7 @@ override_dh_auto_configure:
 		-Dauto_features=enabled \
 		-Davahi=enabled \
 		-Dbluez5-backend-native-mm=enabled \
-		-Dbluez5-codec-aac=disabled \
+		-Dbluez5-codec-aac=enabled \
 		-Dbluez5-codec-aptx=enabled \
 		-Dbluez5-codec-lc3=enabled \
 		-Dbluez5-codec-lc3plus=disabled \