Author: titmuss
Date: Wed May 21 06:17:35 2008
New Revision: 2505
URL: http://svn.slimdevices.com?rev=2505&root=Jive&view=rev
Log:
Bug: N/A
Description:
Build fixes.
Limit flac to only build libflac without the encoder.
Modified:
7.2/trunk/squeezeplay/src/Makefile.linux
7.2/trunk/squeezeplay/src/Makefile.osx
7.2/trunk/squeezeplay/src/flac-1.2.1/Makefile.am
7.2/trunk/squeezeplay/src/flac-1.2.1/Makefile.in
7.2/trunk/squeezeplay/src/flac-1.2.1/src/Makefile.am
7.2/trunk/squeezeplay/src/flac-1.2.1/src/Makefile.in
7.2/trunk/squeezeplay/src/flac-1.2.1/src/libFLAC/Makefile.am
7.2/trunk/squeezeplay/src/flac-1.2.1/src/libFLAC/Makefile.in
7.2/trunk/squeezeplay/src/slnunicode-1.1/config_include.linux
7.2/trunk/squeezeplay/src/squeezeplay/configure
7.2/trunk/squeezeplay/src/squeezeplay/configure.in
7.2/trunk/squeezeplay/src/squeezeplay/src/common.h
7.2/trunk/squeezeplay/src/squeezeplay/src/config.h.in
Modified: 7.2/trunk/squeezeplay/src/Makefile.linux
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/Makefile.linux?rev=2505&root=Jive&r1=2504&r2=2505&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/Makefile.linux (original)
+++ 7.2/trunk/squeezeplay/src/Makefile.linux Wed May 21 06:17:35 2008
@@ -155,7 +155,7 @@
# flac
flac-1.2.1/Makefile:
- cd flac-1.2.1; ./configure --prefix=${PREFIX}
+ cd flac-1.2.1; ./configure --disable-ogg --prefix=${PREFIX}
flac: flac-1.2.1/Makefile
cd flac-1.2.1; make && make install
Modified: 7.2/trunk/squeezeplay/src/Makefile.osx
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/Makefile.osx?rev=2505&root=Jive&r1=2504&r2=2505&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/Makefile.osx (original)
+++ 7.2/trunk/squeezeplay/src/Makefile.osx Wed May 21 06:17:35 2008
@@ -172,7 +172,7 @@
# flac
flac-1.2.1/Makefile:
- cd flac-1.2.1; ./configure --prefix=${PREFIX}
--disable-asm-optimizations
+ cd flac-1.2.1; ./configure --disable-ogg --disable-asm-optimizations
--prefix=${PREFIX}
flac: flac-1.2.1/Makefile
cd flac-1.2.1; make && make install
Modified: 7.2/trunk/squeezeplay/src/flac-1.2.1/Makefile.am
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/flac-1.2.1/Makefile.am?rev=2505&root=Jive&r1=2504&r2=2505&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/flac-1.2.1/Makefile.am (original)
+++ 7.2/trunk/squeezeplay/src/flac-1.2.1/Makefile.am Wed May 21 06:17:35 2008
@@ -30,7 +30,8 @@
AUTOMAKE_OPTIONS = foreign 1.7
-SUBDIRS = doc include m4 man src examples test build obj
+#SUBDIRS = doc include m4 man src examples test build obj
+SUBDIRS = include src build obj
DISTCLEANFILES = libtool-disable-static
Modified: 7.2/trunk/squeezeplay/src/flac-1.2.1/Makefile.in
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/flac-1.2.1/Makefile.in?rev=2505&root=Jive&r1=2504&r2=2505&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/flac-1.2.1/Makefile.in (original)
+++ 7.2/trunk/squeezeplay/src/flac-1.2.1/Makefile.in Wed May 21 06:17:35 2008
@@ -276,7 +276,9 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
AUTOMAKE_OPTIONS = foreign 1.7
-SUBDIRS = doc include m4 man src examples test build obj
+
+#SUBDIRS = doc include m4 man src examples test build obj
+SUBDIRS = include src build obj
DISTCLEANFILES = libtool-disable-static
EXTRA_DIST = \
COPYING.FDL \
Modified: 7.2/trunk/squeezeplay/src/flac-1.2.1/src/Makefile.am
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/flac-1.2.1/src/Makefile.am?rev=2505&root=Jive&r1=2504&r2=2505&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/flac-1.2.1/src/Makefile.am (original)
+++ 7.2/trunk/squeezeplay/src/flac-1.2.1/src/Makefile.am Wed May 21 06:17:35
2008
@@ -25,18 +25,18 @@
SUBDIRS = \
libFLAC \
- share \
- flac \
- metaflac \
- monkeys_audio_utilities \
- $(XMMS_DIRS) \
- plugin_winamp2 \
- test_grabbag \
- test_libs_common \
- test_libFLAC \
- test_seeking \
- test_streams \
- $(CPPLIBS_DIRS)
+ #share \
+ #flac \
+ #metaflac \
+ #monkeys_audio_utilities \
+ #$(XMMS_DIRS) \
+ #plugin_winamp2 \
+ #test_grabbag \
+ #test_libs_common \
+ #test_libFLAC \
+ #test_seeking \
+ #test_streams \
+ #$(CPPLIBS_DIRS)
EXTRA_DIST = \
Makefile.lite
Modified: 7.2/trunk/squeezeplay/src/flac-1.2.1/src/Makefile.in
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/flac-1.2.1/src/Makefile.in?rev=2505&root=Jive&r1=2504&r2=2505&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/flac-1.2.1/src/Makefile.in (original)
+++ 7.2/trunk/squeezeplay/src/flac-1.2.1/src/Makefile.in Wed May 21 06:17:35
2008
@@ -72,10 +72,7 @@
uninstall-recursive
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = libFLAC share flac metaflac monkeys_audio_utilities \
- plugin_common plugin_xmms plugin_winamp2 test_grabbag \
- test_libs_common test_libFLAC test_seeking test_streams \
- libFLAC++ test_libFLAC++
+DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -254,18 +251,18 @@
@[EMAIL PROTECTED] = libFLAC++ test_libFLAC++
SUBDIRS = \
libFLAC \
- share \
- flac \
- metaflac \
- monkeys_audio_utilities \
- $(XMMS_DIRS) \
- plugin_winamp2 \
- test_grabbag \
- test_libs_common \
- test_libFLAC \
- test_seeking \
- test_streams \
- $(CPPLIBS_DIRS)
+ #share \
+ #flac \
+ #metaflac \
+ #monkeys_audio_utilities \
+ #$(XMMS_DIRS) \
+ #plugin_winamp2 \
+ #test_grabbag \
+ #test_libs_common \
+ #test_libFLAC \
+ #test_seeking \
+ #test_streams \
+ #$(CPPLIBS_DIRS)
EXTRA_DIST = \
Makefile.lite
Modified: 7.2/trunk/squeezeplay/src/flac-1.2.1/src/libFLAC/Makefile.am
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/flac-1.2.1/src/libFLAC/Makefile.am?rev=2505&root=Jive&r1=2504&r2=2505&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/flac-1.2.1/src/libFLAC/Makefile.am (original)
+++ 7.2/trunk/squeezeplay/src/flac-1.2.1/src/libFLAC/Makefile.am Wed May 21
06:17:35 2008
@@ -112,7 +112,7 @@
metadata_iterators.c \
metadata_object.c \
stream_decoder.c \
- stream_encoder.c \
- stream_encoder_framing.c \
+ #stream_encoder.c \
+ #stream_encoder_framing.c \
window.c \
$(extra_ogg_sources)
Modified: 7.2/trunk/squeezeplay/src/flac-1.2.1/src/libFLAC/Makefile.in
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/flac-1.2.1/src/libFLAC/Makefile.in?rev=2505&root=Jive&r1=2504&r2=2505&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/flac-1.2.1/src/libFLAC/Makefile.in (original)
+++ 7.2/trunk/squeezeplay/src/flac-1.2.1/src/libFLAC/Makefile.in Wed May 21
06:17:35 2008
@@ -94,20 +94,9 @@
@FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@@FLaC__HAS_NASM_FALSE@@[EMAIL
PROTECTED] = ppc/gas/libFLAC-asm.la
@FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@@FLaC__HAS_NASM_FALSE@@[EMAIL
PROTECTED] = ppc/as/libFLAC-asm.la
libFLAC_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__libFLAC_la_SOURCES_DIST = bitmath.c bitreader.c bitwriter.c cpu.c \
- crc.c fixed.c float.c format.c lpc.c md5.c memory.c \
- metadata_iterators.c metadata_object.c stream_decoder.c \
- stream_encoder.c stream_encoder_framing.c window.c \
- ogg_decoder_aspect.c ogg_encoder_aspect.c ogg_helper.c \
- ogg_mapping.c
[EMAIL PROTECTED]@am__objects_1 = ogg_decoder_aspect.lo \
[EMAIL PROTECTED]@ ogg_encoder_aspect.lo ogg_helper.lo \
[EMAIL PROTECTED]@ ogg_mapping.lo
am_libFLAC_la_OBJECTS = bitmath.lo bitreader.lo bitwriter.lo cpu.lo \
crc.lo fixed.lo float.lo format.lo lpc.lo md5.lo memory.lo \
- metadata_iterators.lo metadata_object.lo stream_decoder.lo \
- stream_encoder.lo stream_encoder_framing.lo window.lo \
- $(am__objects_1)
+ metadata_iterators.lo metadata_object.lo stream_decoder.lo
libFLAC_la_OBJECTS = $(am_libFLAC_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -121,7 +110,7 @@
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libFLAC_la_SOURCES)
-DIST_SOURCES = $(am__libFLAC_la_SOURCES_DIST)
+DIST_SOURCES = $(libFLAC_la_SOURCES)
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-exec-recursive install-info-recursive \
@@ -363,8 +352,8 @@
metadata_iterators.c \
metadata_object.c \
stream_decoder.c \
- stream_encoder.c \
- stream_encoder_framing.c \
+ #stream_encoder.c \
+ #stream_encoder_framing.c \
window.c \
$(extra_ogg_sources)
@@ -452,14 +441,7 @@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c
-o $@ $<; \
Modified: 7.2/trunk/squeezeplay/src/slnunicode-1.1/config_include.linux
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/slnunicode-1.1/config_include.linux?rev=2505&root=Jive&r1=2504&r2=2505&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/slnunicode-1.1/config_include.linux (original)
+++ 7.2/trunk/squeezeplay/src/slnunicode-1.1/config_include.linux Wed May 21
06:17:35 2008
@@ -8,7 +8,7 @@
# for Linux
#CC=gcc
DEF=-DLUASOCKET_DEBUG
-MYCFLAGS= $(LUAINC) -I$(COMPAT) $(DEF) -pedantic -Wall -O2 -fpic
-fno-stack-protector
+MYCFLAGS= $(LUAINC) -I$(COMPAT) $(DEF) -pedantic -Wall -O2 -fpic
MYLDFLAGS=-O -fpic -shared
#LD=gcc
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/configure
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/configure?rev=2505&root=Jive&r1=2504&r2=2505&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/configure (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/configure Wed May 21 06:17:35 2008
@@ -20531,7 +20531,8 @@
-for ac_header in fcntl.h libgen.h stdlib.h stropts.h string.h sys/time.h
unistd.h netdb.h arpa/inet.h
+
+for ac_header in fcntl.h libgen.h stdlib.h stropts.h string.h sys/time.h
sys/socket.h unistd.h netdb.h arpa/inet.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/configure.in
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/configure.in?rev=2505&root=Jive&r1=2504&r2=2505&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/configure.in (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/configure.in Wed May 21 06:17:35 2008
@@ -47,7 +47,7 @@
# Checks for header files.
AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h libgen.h stdlib.h stropts.h string.h sys/time.h
unistd.h netdb.h arpa/inet.h])
+AC_CHECK_HEADERS([fcntl.h libgen.h stdlib.h stropts.h string.h sys/time.h
sys/socket.h unistd.h netdb.h arpa/inet.h])
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/src/common.h
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/src/common.h?rev=2505&root=Jive&r1=2504&r2=2505&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/src/common.h (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/src/common.h Wed May 21 06:17:35 2008
@@ -43,6 +43,10 @@
#include <sys/time.h>
#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -54,6 +58,7 @@
#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif
+
#ifndef PATH_MAX
/* Default POSIX maximum path length */
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/src/config.h.in
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/src/config.h.in?rev=2505&root=Jive&r1=2504&r2=2505&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/src/config.h.in (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/src/config.h.in Wed May 21 06:17:35
2008
@@ -81,6 +81,9 @@
/* Define to 1 if you have the `strtol' function. */
#undef HAVE_STRTOL
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#undef HAVE_SYS_SOCKET_H
+
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
