mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

pulseaudio: simplify and rework Makefile 

There were two conffiles sections and both of them were same, but for
different variants. We can have just one conffile section and use it also
for the other variant.

The same applies for the install section for different variants.
- We have two install sections, but we call the first one with the same
  files and then add something more for the second variant.

- While at it to make it easier, let's change those three rows for
  copying packages into the single one to make sure that I did not miss
anything. Also, we create a directory first and then move files.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
This commit is contained in:
Josef Schlehofer 2022-10-29 23:37:09 +02:00 committed by Rosen Penev
parent c2a270eb7a
commit 60ac7dd751
1 changed files with 43 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

173
sound/pulseaudio/Makefile
View File

@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk include $(INCLUDE_DIR)/nls.mk
include $(INCLUDE_DIR)/meson.mk include $(INCLUDE_DIR)/meson.mk
define Package/pulseaudio/Default define Package/pulseaudio-daemon/Default
SECTION:=sound SECTION:=sound
CATEGORY:=Sound CATEGORY:=Sound
DEPENDS:=+libsndfile +libltdl +libpthread +librt +alsa-lib \ DEPENDS:=+libsndfile +libltdl +libpthread +librt +alsa-lib \
@ -38,27 +38,23 @@ define Package/pulseaudio/Default
endef endef
define Package/pulseaudio-daemon define Package/pulseaudio-daemon
$(call Package/pulseaudio/Default) $(call Package/pulseaudio-daemon/Default)
VARIANT:=noavahi VARIANT:=noavahi
endef endef
define Package/pulseaudio-daemon-avahi define Package/pulseaudio-daemon-avahi
$(call Package/pulseaudio/Default) $(call Package/pulseaudio-daemon/Default)
DEPENDS+=+dbus +libavahi-client +sbc DEPENDS+=+dbus +libavahi-client +sbc
TITLE+= (avahi/bluez) TITLE+= (avahi/bluez)
VARIANT:=avahi VARIANT:=avahi
endef endef
define Package/pulseaudio/Default/description define Package/pulseaudio-daemon/description
PulseAudio (formerly Polypaudio) is a cross-platform, networked sound server. PulseAudio (formerly Polypaudio) is a cross-platform, networked sound server.
endef endef
define Package/pulseaudio-daemon/description
$(call Package/pulseaudio/Default/description)
endef
define Package/pulseaudio-daemon-avahi/description define Package/pulseaudio-daemon-avahi/description
$(call Package/pulseaudio/Default/description) $(call Package/pulseaudio-daemon/description)
This package enables avahi,bluez and is compiled against dbus, sbc, and avahi. This package enables avahi,bluez and is compiled against dbus, sbc, and avahi.
endef endef
@ -69,12 +65,7 @@ define Package/pulseaudio-daemon/conffiles
/etc/pulse/system.pa /etc/pulse/system.pa
endef endef
define Package/pulseaudio-daemon-avahi/conffiles Package/pulseaudio-daemon/conffiles = $(Package/pulseaudio-daemon-avahi/conffiles)
/etc/pulse/client.conf
/etc/pulse/daemon.conf
/etc/pulse/default.pa
/etc/pulse/system.pa
endef
define Package/pulseaudio-tools define Package/pulseaudio-tools
SECTION:=sound SECTION:=sound
@ -157,140 +148,62 @@ endif
endef endef
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) \ $(INSTALL_DIR) $(1)/usr/include/pulse
$(1)/usr/lib/pkgconfig \ $(CP) $(PKG_INSTALL_DIR)/usr/include/pulse/* $(1)/usr/include/pulse
$(1)/usr/include/pulse \
$(1)/usr/lib \ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(1)/usr/lib/pulseaudio $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig
$(CP) \ $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/libpulse.pc
$(PKG_INSTALL_DIR)/usr/include/pulse/* \ $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/libpulse.pc
$(1)/usr/include/pulse $(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/libpulse-simple.pc
$(CP) \ $(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/libpulse-simple.pc
$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \
$(1)/usr/lib/pkgconfig $(INSTALL_DIR) $(1)/usr/lib
$(SED) \ $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
's,/usr/include,$$$${prefix}/include,g' \
$(1)/usr/lib/pkgconfig/libpulse.pc $(INSTALL_DIR) $(1)/usr/lib/pulseaudio
$(SED) \ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pulseaudio/* $(1)/usr/lib/pulseaudio/
's,/usr/lib,$$$${exec_prefix}/lib,g' \
$(1)/usr/lib/pkgconfig/libpulse.pc
$(SED) \
's,/usr/include,$$$${prefix}/include,g' \
$(1)/usr/lib/pkgconfig/libpulse-simple.pc
$(SED) \
's,/usr/lib,$$$${exec_prefix}/lib,g' \
$(1)/usr/lib/pkgconfig/libpulse-simple.pc
$(CP) \
$(PKG_INSTALL_DIR)/usr/lib/*.so* \
$(1)/usr/lib/
$(CP) \
$(PKG_INSTALL_DIR)/usr/lib/pulseaudio/* \
$(1)/usr/lib/pulseaudio/
endef endef
define Package/pulseaudio-daemon/install define Package/pulseaudio-daemon/install
$(INSTALL_DIR) \ $(INSTALL_DIR) $(1)/usr/bin
$(1)/etc/pulse \ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pulseaudio $(1)/usr/bin/pulseaudio
$(1)/etc/init.d \
$(1)/usr/bin \
$(1)/usr/lib \
$(1)/usr/lib/pulseaudio \
$(1)/usr/lib/pulse-$(PKG_VERSION)/modules
$(INSTALL_BIN) \ $(INSTALL_DIR) $(1)/etc/init.d
$(PKG_INSTALL_DIR)/usr/bin/pulseaudio \ $(INSTALL_BIN) ./files/pulseaudio.init $(1)/etc/init.d/pulseaudio
$(1)/usr/bin/pulseaudio
$(INSTALL_BIN) \ $(INSTALL_DIR) $(1)/etc/pulse
./files/pulseaudio.init \ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/pulse/* $(1)/etc/pulse
$(1)/etc/init.d/pulseaudio
$(INSTALL_DATA) \ $(INSTALL_DIR) $(1)/usr/lib
$(PKG_INSTALL_DIR)/etc/pulse/* \ $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
$(1)/etc/pulse
$(CP) \ $(INSTALL_DIR) $(1)/usr/lib/pulseaudio
$(PKG_INSTALL_DIR)/usr/lib/*.so* \ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pulseaudio/* $(1)/usr/lib/pulseaudio/
$(1)/usr/lib/
$(CP) \
$(PKG_INSTALL_DIR)/usr/lib/pulseaudio/* \
$(1)/usr/lib/pulseaudio/
$(CP) \
$(PKG_INSTALL_DIR)/usr/lib/pulse-$(PKG_VERSION)/modules/lib*.so \
$(1)/usr/lib/
$(CP) \
$(PKG_INSTALL_DIR)/usr/lib/pulse-$(PKG_VERSION)/modules/module*.so \
$(1)/usr/lib/pulse-$(PKG_VERSION)/modules/
$(INSTALL_DIR) $(1)/usr/lib/pulse-$(PKG_VERSION)/modules
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pulse-$(PKG_VERSION)/modules/lib*.so $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pulse-$(PKG_VERSION)/modules/module*.so $(1)/usr/lib/pulse-$(PKG_VERSION)/modules/
endef endef
define Package/pulseaudio-daemon-avahi/install define Package/pulseaudio-daemon-avahi/install
$(INSTALL_DIR) \ $(call Package/pulseaudio-daemon/install,$1)
$(1)/etc/pulse \
$(1)/etc/init.d \
$(1)/usr/bin \
$(1)/usr/lib \
$(1)/usr/lib/pulseaudio \
$(1)/usr/lib/pulse-$(PKG_VERSION)/modules \
$(1)/etc/dbus-1/system.d
$(INSTALL_BIN) \ $(INSTALL_DIR) $(1)/etc/dbus-1/system.d
$(PKG_INSTALL_DIR)/usr/bin/pulseaudio \ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/dbus-1/system.d/pulseaudio-system.conf $(1)/etc/dbus-1/system.d/pulseaudio-system.conf
$(1)/usr/bin/pulseaudio
$(INSTALL_BIN) \
./files/pulseaudio.init \
$(1)/etc/init.d/pulseaudio
$(INSTALL_DATA) \
$(PKG_INSTALL_DIR)/etc/pulse/* \
$(1)/etc/pulse
$(CP) \
$(PKG_INSTALL_DIR)/usr/lib/*.so* \
$(1)/usr/lib/
$(CP) \
$(PKG_INSTALL_DIR)/usr/lib/pulseaudio/* \
$(1)/usr/lib/pulseaudio/
$(CP) \
$(PKG_INSTALL_DIR)/usr/lib/pulse-$(PKG_VERSION)/modules/lib*.so \
$(1)/usr/lib/
$(CP) \
$(PKG_INSTALL_DIR)/usr/lib/pulse-$(PKG_VERSION)/modules/module*.so \
$(1)/usr/lib/pulse-$(PKG_VERSION)/modules/
$(INSTALL_DATA) \
$(PKG_INSTALL_DIR)/etc/dbus-1/system.d/pulseaudio-system.conf \
$(1)/etc/dbus-1/system.d/pulseaudio-system.conf
endef endef
define Package/pulseaudio-tools/install define Package/pulseaudio-tools/install
$(INSTALL_DIR) \ $(INSTALL_DIR) $(1)/usr/bin
$(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pa* $(1)/usr/bin/
$(INSTALL_BIN) \
$(PKG_INSTALL_DIR)/usr/bin/pa* \
$(1)/usr/bin/
endef endef
define Package/pulseaudio-profiles/install define Package/pulseaudio-profiles/install
$(INSTALL_DIR) \ $(INSTALL_DIR) $(1)/usr/share/pulseaudio/alsa-mixer/paths
$(1)/usr/share/pulseaudio/alsa-mixer/paths \ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/pulseaudio/alsa-mixer/paths/* $(1)/usr/share/pulseaudio/alsa-mixer/paths
$(1)/usr/share/pulseaudio/alsa-mixer/profile-sets
$(INSTALL_DATA) \ $(INSTALL_DIR) $(1)/usr/share/pulseaudio/alsa-mixer/profile-sets
$(PKG_INSTALL_DIR)/usr/share/pulseaudio/alsa-mixer/paths/* \ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/pulseaudio/alsa-mixer/profile-sets/* $(1)/usr/share/pulseaudio/alsa-mixer/profile-sets
$(1)/usr/share/pulseaudio/alsa-mixer/paths
$(INSTALL_DATA) \
$(PKG_INSTALL_DIR)/usr/share/pulseaudio/alsa-mixer/profile-sets/* \
$(1)/usr/share/pulseaudio/alsa-mixer/profile-sets
endef endef
$(eval $(call BuildPackage,pulseaudio-daemon)) $(eval $(call BuildPackage,pulseaudio-daemon))