Changeset 21054


Ignore:
Timestamp:
2010-04-20T19:20:04+02:00 (7 years ago)
Author:
mirko
Message:

several changes to mpd Makefile

  • general cleanup, adjust dependencies -> make build more deterministic
  • enable AAC-support (link against libfaad2)
  • disable sqlite support, as this is only used for the "sticker" feature
  • make build depend on BUILD_PATENTED flag (affects aac/mp3 support)
  • provide avahi service file for mpd to have some kind of mdns support
Location:
packages/sound/mpd
Files:
3 added
1 edited

Legend:

Unmodified
Added
Removed
  • packages/sound/mpd/Makefile

    r20567 r21054  
    2323  SECTION:=sound 
    2424  CATEGORY:=Sound 
    25   DEPENDS:=+libflac +libid3tag +libmad +libvorbisidec +libpthread +glib2 \ 
    26         +libmms +libcurl +libsqlite3 +libvorbis +libshout 
     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 
    2727  TITLE:=Music Player Daemon 
    2828  URL:=http://www.musicpd.org/ 
     
    3939endef 
    4040 
     41TARGET_CFLAGS += \ 
     42        -I$(STAGING_DIR)/usr/lib/libintl/include/ \ 
     43        -I$(STAGING_DIR)/usr/lib/libiconv/include/ 
     44 
     45TARGET_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 
     50# oggflac is not compatible with tremor 
    4151CONFIGURE_ARGS+= \ 
    42         --disable-audiofile \ 
     52        --$(if $(CONFIG_BUILD_PATENTED),enable-mad,disable-mad) \ 
     53        --enable-alsa \ 
     54        --enable-audiofile \ 
    4355        --disable-mpc \ 
    44         --disable-aac \ 
     56        --$(if $(CONFIG_BUILD_PATENTED),enable-aac,disable-aac) \ 
    4557        --disable-lsr \ 
    4658        --disable-ao \ 
    4759        --disable-mvp \ 
    48         --disable-lametest \ 
    4960        --disable-lame-encoder \ 
     61        --disable-ffmpeg \ 
    5062        --enable-flac \ 
     63        --enable-vorbis \ 
     64        --disable-oggflac \ 
     65        --disable-sqlite \ 
     66        --enable-shout \ 
     67        --enable-id3 \ 
    5168        --enable-lastfm \ 
    5269        --enable-mms \ 
    53         --with-tremor="$(STAGING_DIR)/usr/lib" \ 
    54  
    55 ifeq ($(CONFIG_PACKAGE_kmod-sound-core),) 
    56         CONFIGURE_ARGS+= --disable-alsa 
    57 endif 
     70        --enable-curl \ 
     71        --disable-oss \ 
     72        --enable-aac \ 
     73        --with-zeroconf=no \ 
     74        --disable-libOggFLACtest \ 
     75        --disable-test \ 
     76        --with-tremor=yes \ 
     77        --with-faad="$(STAGING_DIR)/usr" \ 
    5878 
    5979# use gcc instead of g++ to avoid unnecessary linking against libstdc++ 
     
    6282TARGET_CFLAGS+=-std=gnu99 
    6383 
     84 
    6485CONFIGURE_VARS += \ 
    65         CURL_LIBS="-L$(STAGING_DIR)/usr/lib -lssl -lcrypto -lcurl" \ 
    66         CURL_CFLAGS="-I$(STAGING_DIR)/usr/include" \ 
    67         ID3TAG_LIBS="$(TARGET_LDFLAGS) -lz -lid3tag" \ 
    68         ID3TAG_CFLAGS="$(TARGET_CPPFLAGS)" \ 
     86        FLAC_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/FLAC" \ 
    6987        FLAC_LIBS="$(TARGET_LDFLAGS) -lFLAC" \ 
    70         FLAC_CFLAGS="-I$(STAGING_DIR)/usr/include/FLAC" \ 
    71         MAD_LIBS="$(TARGET_LDFLAGS) -lmad" \ 
    72         MAD_CFLAGS="$(TARGET_CPPFLAGS)" \ 
    73         OGGVORBIS_LIBS="$(TARGET_LDLFAGS) -lvorbisidec" \ 
    74         OGGVORBIS_CFLAGS="$(TARGET_CPPFLAGS)" \ 
    75         GLIB_CFLAGS="-I$(STAGING_DIR)/usr/include/glib-2.0 -I$(STAGING_DIR)/usr/lib/glib-2.0/include" \ 
    76         GLIB_LIBS="$(TARGET_LDLFAGS) -L$(STAGING_DIR)/usr/lib/libintl/lib -lintl -L$(STAGING_DIR)/usr/lib/libiconv/lib -liconv -lglib-2.0 -lgthread-2.0 -pthread" 
     88        $(if $(CONFIG_BUILD_PATENTED),MAD_CFLAGS="$(TARGET_CFLAGS)") \ 
     89        $(if $(CONFIG_BUILD_PATENTED),MAD_LIBS="$(TARGET_LDFLAGS) -lmad") \ 
    7790 
    7891define Package/mpd/install 
Note: See TracChangeset for help on using the changeset viewer.