Ignore:
Timestamp:
2010-04-23T03:13:11+02:00 (7 years ago)
Author:
nico
Message:

[packages] mpd: ship avahi files added in [21054], make dependency on alsa-lib conditional, more cleanup

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/sound/mpd/Makefile

    r21054 r21098  
    1010PKG_NAME:=mpd 
    1111PKG_VERSION:=0.15.8 
    12 PKG_RELEASE:=2 
     12PKG_RELEASE:=3 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
     
    2323  SECTION:=sound 
    2424  CATEGORY:=Sound 
    25   # libvorbis and therewith libogg are needed for shout support 
    26   DEPENDS:=+libflac +BUILD_PATENTED:libfaad2 +BUILD_PATENTED:libmad +libvorbisidec +libpthread +glib2 +libmms +libcurl +libshout +alsa-lib +libvorbis 
    2725  TITLE:=Music Player Daemon 
    2826  URL:=http://www.musicpd.org/ 
     27# libvorbis and therewith libogg are needed for shout support 
     28  DEPENDS:= \ 
     29        +AUDIO_SUPPORT:alsa-lib \ 
     30        +BUILD_PATENTED:libfaad2 +BUILD_PATENTED:libmad \ 
     31        +glib2 +libcurl +libflac +libmms +libpthread +libshout \ 
     32        +libvorbis +libvorbisidec  
    2933endef 
    3034 
    3135define Package/mpd/description 
    32         MPD is a music player supporting flac, mp3 and ogg files. 
    33         It is typically controlled over a network using one of it's many 
    34         clients including mpc(console), gmpc(gnome), phpmp(php) etc. 
     36 MPD is a music player supporting flac, mp3 and ogg files. It is 
     37 typically controlled over a network using one of it's many clients 
     38 including mpc(console), gmpc(gnome), phpmp(php), etc... 
    3539endef 
    3640 
    3741define Package/mpd/conffiles 
     42/etc/avahi/services/mpd.service 
    3843/etc/mpd.conf 
    3944endef 
    4045 
    41 TARGET_CFLAGS += \ 
    42         -I$(STAGING_DIR)/usr/lib/libintl/include/ \ 
    43         -I$(STAGING_DIR)/usr/lib/libiconv/include/ 
    44  
    45 TARGET_LDFLAGS += \ 
    46         -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ 
    47         -L$(STAGING_DIR)/usr/lib/libintl/lib/ \ 
    48         -L$(STAGING_DIR)/usr/lib/libiconv/lib/ 
    49  
    5046# oggflac is not compatible with tremor 
    51 CONFIGURE_ARGS+= \ 
    52         --$(if $(CONFIG_BUILD_PATENTED),enable-mad,disable-mad) \ 
    53         --enable-alsa \ 
     47CONFIGURE_ARGS += \ 
     48        $(call autoconf_bool,CONFIG_BUILD_PATENTED,mad) \ 
     49        $(call autoconf_bool,CONFIG_AUDIO_SUPPORT,alsa) \ 
    5450        --enable-audiofile \ 
    5551        --disable-mpc \ 
    56         --$(if $(CONFIG_BUILD_PATENTED),enable-aac,disable-aac) \ 
     52        $(call autoconf_bool,CONFIG_BUILD_PATENTED,aac) \ 
    5753        --disable-lsr \ 
    5854        --disable-ao \ 
     
    6359        --enable-vorbis \ 
    6460        --disable-oggflac \ 
     61        --disable-cue \ 
     62        --disable-jack \ 
     63        --disable-modplug \ 
     64        --disable-pulse \ 
     65        --disable-sidplay \ 
    6566        --disable-sqlite \ 
    6667        --enable-shout \ 
     
    7778        --with-faad="$(STAGING_DIR)/usr" \ 
    7879 
    79 # use gcc instead of g++ to avoid unnecessary linking against libstdc++ 
    80 TARGET_CXX=$(TARGET_CC) 
    81  
    82 TARGET_CFLAGS+=-std=gnu99 
    83  
    84  
    8580CONFIGURE_VARS += \ 
    8681        FLAC_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/FLAC" \ 
     
    8883        $(if $(CONFIG_BUILD_PATENTED),MAD_CFLAGS="$(TARGET_CFLAGS)") \ 
    8984        $(if $(CONFIG_BUILD_PATENTED),MAD_LIBS="$(TARGET_LDFLAGS) -lmad") \ 
     85 
     86TARGET_CFLAGS += \ 
     87        -std=gnu99 \ 
     88        -I$(STAGING_DIR)/usr/lib/libintl/include/ \ 
     89        -I$(STAGING_DIR)/usr/lib/libiconv/include/ \ 
     90 
     91TARGET_LDFLAGS += \ 
     92        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ 
     93        -L$(STAGING_DIR)/usr/lib/libintl/lib/ \ 
     94        -L$(STAGING_DIR)/usr/lib/libiconv/lib/ \ 
     95 
     96# use gcc instead of g++ to avoid unnecessary linking against libstdc++ 
     97TARGET_CXX:=$(TARGET_CC) 
    9098 
    9199define Package/mpd/install 
     
    96104        $(INSTALL_DIR) $(1)/etc/init.d 
    97105        $(INSTALL_BIN) ./files/mpd.init $(1)/etc/init.d/mpd 
     106        $(INSTALL_DIR) $(1)/etc/avahi/services 
     107        $(INSTALL_DATA) ./files/mpd.service $(1)/etc/avahi/services/ 
    98108endef 
    99109 
Note: See TracChangeset for help on using the changeset viewer.