Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Samuli Suominen (drac)" <drac@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/mt-daapd/files: mt-daapd-0.2.4.1-pidfile.patch mt-daapd-0.2.4.1-libsorder.patch digest-mt-daapd-0.2.4.1 digest-mt-daapd-0.3.0_pre1376
Date: Sun, 28 Oct 2007 22:13:48
Message-Id: E1ImGO5-00017Y-J5@stork.gentoo.org
1 drac 07/10/28 22:13:41
2
3 Added: mt-daapd-0.2.4.1-pidfile.patch
4 mt-daapd-0.2.4.1-libsorder.patch
5 digest-mt-daapd-0.2.4.1
6 Removed: digest-mt-daapd-0.3.0_pre1376
7 Log:
8 Version bump dropping howl support.
9 (Portage version: 2.1.3.16)
10
11 Revision Changes Path
12 1.1 media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch
13
14 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-pidfile.patch?rev=1.1&content-type=text/plain
16
17 Index: mt-daapd-0.2.4.1-pidfile.patch
18 ===================================================================
19 diff -ur mt-daapd-0.2.4.1.orig/src/main.c mt-daapd-0.2.4.1/src/main.c
20 --- mt-daapd-0.2.4.1.orig/src/main.c 2007-10-22 02:27:57.000000000 +0300
21 +++ mt-daapd-0.2.4.1/src/main.c 2007-10-28 23:54:29.000000000 +0200
22 @@ -551,6 +551,7 @@
23 printf(" -m Disable mDNS\n");
24 printf(" -c <file> Use configfile specified\n");
25 printf(" -p Parse playlist file\n");
26 + printf(" -P <file> Write the PID to specified file\n");
27 printf(" -f Run in foreground\n");
28 printf(" -y Yes, go ahead and run as non-root user\n");
29 printf("\n\n");
30 @@ -708,6 +709,7 @@
31 int main(int argc, char *argv[]) {
32 int option;
33 char *configfile=DEFAULT_CONFIGFILE;
34 + char *pidfile=PIDFILE;
35 WSCONFIG ws_config;
36 WSHANDLE server;
37 int parseonly=0;
38 @@ -726,7 +728,7 @@
39 config.use_mdns=1;
40 err_debuglevel=1;
41
42 - while((option=getopt(argc,argv,"D:d:c:mpfry")) != -1) {
43 + while((option=getopt(argc,argv,"D:d:c:mpP:fry")) != -1) {
44 switch(option) {
45 case 'd':
46 err_debuglevel=atoi(optarg);
47 @@ -754,6 +756,10 @@
48 foreground=1;
49 break;
50
51 + case 'P':
52 + pidfile=optarg;
53 + break;
54 +
55 case 'r':
56 reload=1;
57 break;
58 @@ -803,8 +809,8 @@
59
60 /* open the pidfile, so it can be written once we detach */
61 if((!foreground) && (!force_non_root)) {
62 - if(-1 == (pid_fd = open(PIDFILE,O_CREAT | O_WRONLY | O_TRUNC, 0644)))
63 - DPRINTF(E_FATAL,L_MAIN,"Error opening pidfile (%s): %s\n",PIDFILE,strerror(errno));
64 + if(-1 == (pid_fd = open(pidfile,O_CREAT | O_WRONLY | O_TRUNC, 0644)))
65 + DPRINTF(E_FATAL,L_MAIN,"Error opening pidfile (%s): %s\n",pidfile,strerror(errno));
66
67 if(0 == (pid_fp = fdopen(pid_fd, "w")))
68 DPRINTF(E_FATAL,L_MAIN,"fdopen: %s\n",strerror(errno));
69
70
71
72 1.1 media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch
73
74 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch?rev=1.1&view=markup
75 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mt-daapd/files/mt-daapd-0.2.4.1-libsorder.patch?rev=1.1&content-type=text/plain
76
77 Index: mt-daapd-0.2.4.1-libsorder.patch
78 ===================================================================
79 diff -ur mt-daapd-0.2.4.1.orig/configure.in mt-daapd-0.2.4.1/configure.in
80 --- mt-daapd-0.2.4.1.orig/configure.in 2007-10-22 02:50:24.000000000 +0300
81 +++ mt-daapd-0.2.4.1/configure.in 2007-10-28 23:31:43.000000000 +0200
82 @@ -20,8 +20,9 @@
83 CPPFLAGS="${CPPFLAGS} -g"
84
85 dnl fix freebsd's broken (?) libpthread
86 -AC_CHECK_LIB(c_r,pthread_creat,LDFLAGS="${LDFLAGS} -lc_r", [
87 - AC_CHECK_LIB(pthread,pthread_create,LDFLAGS="${LDFLAGS} -lpthread") ])
88 +AC_CHECK_LIB(c_r,pthread_creat,THREAD_LIBS="-lc_r", [
89 + AC_CHECK_LIB(pthread,pthread_create,THREAD_LIBS="-lpthread") ])
90 +AC_SUBST(THREAD_LIBS)
91
92 AC_ARG_ENABLE(debug,[ --enable-debug Enable debugging features],
93 CPPFLAGS="${CPPFLAGS} -Wall")
94 @@ -35,26 +36,29 @@
95 esac ])
96
97 AC_ARG_ENABLE(efence,[ --enable-efence Enable electric fence],
98 - LDFLAGS="${LDFLAGS} -lefence")
99 + EFENCE_LIBS="-lefence")
100 +AC_SUBST(EFENCE_LIBS)
101 AC_ARG_ENABLE(nslu2,[ --enable-nslu2 Build for NSLU2/uNSLUng],
102 CFLAGS="${CFLAGS} -DNSLU2")
103
104 AC_ARG_ENABLE(howl,[ --enable-howl Use howl 0.9.2 or later],
105 [ case "${enableval}" in
106 - yes) rend_howl=true; rend_posix=false; rend_avahi=false; LDFLAGS="${LDFLAGS} -lhowl";
107 + yes) rend_howl=true; rend_posix=false; rend_avahi=false; HOWL_LIBS="-lhowl";
108 CPPFLAGS="${CPPFLAGS} -DWITH_HOWL";;
109 no) rend_howl=false;;
110 *) AC_MSG_ERROR(bad value ${enableval} for --enable-howl);;
111 esac ])
112 +AC_SUBST(HOWL_LIBS)
113
114 AC_ARG_ENABLE(avahi,[ --enable-avahi Use avahi 0.6 or later],
115 [ case "${enableval}" in
116 yes) PKG_CHECK_MODULES(AVAHI, [ avahi-client >= 0.6 ]);
117 - rend_avahi=true; rend_howl=false; rend_posix=false; LDFLAGS="${LDFLAGS} $AVAHI_LIBS";
118 + rend_avahi=true; rend_howl=false; rend_posix=false;
119 CPPFLAGS="${CPPFLAGS} $AVAHI_CFLAGS -DWITH_AVAHI";;
120 no) rend_avahi=false;;
121 *) AC_MSG_ERROR(bad value ${enableval} for --enable-avahi);;
122 esac ])
123 +AC_SUBST(AVAHI_LIBS)
124
125 AC_ARG_ENABLE(oggvorbis,[ --enable-oggvorbis Enable Ogg/Vorbis support],
126 use_oggvorbis=true;
127 @@ -82,7 +86,7 @@
128 CPPFLAGS="$CPPFLAGS -DNOT_HAVE_SA_LEN -D_XPG4_2"
129 CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__ -DHAVE_BROKEN_RECVIF_NAME"
130 CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
131 - LDFLAGS="$LDFLAGS -lnsl -lsocket";;
132 + EXTRA_LIBS="$EXTRA_LIBS -lnsl -lsocket";;
133 *freebsd*)
134 CPPFLAGS="$CPPFLAGS -DFREEBSD";;
135 *linux*)
136 @@ -98,6 +102,8 @@
137 AM_CONDITIONAL(COND_REND_POSIX,false);;
138 esac
139
140 +AC_SUBST(EXTRA_LIBS)
141 +
142 dnl Checks for libraries.
143 AC_ARG_WITH(static-libs,
144 [--with-static-libs[[=DIR]] use static libs in DIR],[
145 @@ -154,12 +160,13 @@
146 AC_CHECK_LIB(gdbm,gdbm_open,echo "Have gdbm", echo "Must have gdbm";exit)
147
148 if test "$STATIC_LIBS" != "no"; then
149 - LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libgdbm.a"
150 + GDBM_LIBS="${STATIC_LIBS}/libgdbm.a"
151 echo "Adding static libgdbm"
152 else
153 - LDFLAGS="${LDFLAGS} -lgdbm"
154 + GDBM_LIBS="-lgdbm"
155 echo "Adding dynamic libgdbm"
156 fi
157 +AC_SUBST(GDBM_LIBS)
158
159 AC_CHECK_HEADERS(id3tag.h,, [
160 AC_MSG_ERROR([id3tag.h not found... try --with-id3tag=dir])])
161 @@ -170,12 +177,14 @@
162 AC_CHECK_LIB(id3tag,id3_file_open,echo "Have id3tag",echo "Must have libid3tag";exit)
163
164 if test "$STATIC_LIBS" != "no"; then
165 - LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libid3tag.a -lz"
166 + ID3_LIBS="${STATIC_LIBS}/libid3tag.a -lz"
167 echo "Adding static libid3tag"
168 else
169 - LDFLAGS="${LDFLAGS} -lid3tag -lz"
170 + ID3_LIBS="-lid3tag -lz"
171 echo "Adding dynamic libid3tag"
172 fi
173 +AC_SUBST([ID3_LIBS])
174 +
175 CFLAGS=$oldcflags
176
177 if test x$use_oggvorbis = xtrue; then
178 @@ -184,22 +193,23 @@
179 AC_CHECK_LIB(ogg,ogg_sync_init,echo "Have ogg",echo "Must have libogg for Ogg/Vorbis support";exit)
180
181 if test x"$STATIC_LIBS" != x"no"; then
182 - LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libogg.a"
183 + OGG_LIBS="${STATIC_LIBS}/libogg.a"
184 echo "Adding static libogg"
185 else
186 - LDFLAGS="${LDFLAGS} -logg"
187 + OGG_LIBS="-logg"
188 echo "Adding dynamic libogg"
189 fi
190 + AC_SUBST(OGG_LIBS)
191
192 AC_CHECK_HEADERS(vorbis/codec.h,, [
193 AC_MSG_ERROR([vorbis/codec.h not found... Must have libvorbis installed for Ogg/Vorbis support])])
194 AC_CHECK_LIB(vorbis,vorbis_info_init,echo "Have vorbis",echo "Must have libvorbis for Ogg/Vorbis support";exit)
195
196 if test x"$STATIC_LIBS" != x"no"; then
197 - LDFLAGS="${LDFLAGS} ${STATIC_LIBS}/libvorbis.a"
198 + OGG_LIBS="${OGG_LIBS} ${STATIC_LIBS}/libvorbis.a"
199 echo "Adding static libvorbis"
200 else
201 - LDFLAGS="${LDFLAGS} -lvorbis"
202 + OGG_LIBS="${OGG_LIBS} -lvorbis"
203 echo "Adding dynamic libvorbis"
204 fi
205 fi
206 diff -ur mt-daapd-0.2.4.1.orig/src/Makefile.am mt-daapd-0.2.4.1/src/Makefile.am
207 --- mt-daapd-0.2.4.1.orig/src/Makefile.am 2007-10-22 03:32:27.000000000 +0300
208 +++ mt-daapd-0.2.4.1/src/Makefile.am 2007-10-28 23:31:33.000000000 +0200
209 @@ -34,6 +34,9 @@
210 redblack.c redblack.h dynamic-art.c dynamic-art.h query.c query.h \
211 $(PRENDSRC) $(ORENDSRC) $(HRENDSRC) $(OGGVORBISSRC) $(ARENDSRC)
212
213 +mt_daapd_LDADD = $(GDBM_LIBS) $(ID3_LIBS) $(OGG_LIBS) $(THREAD_LIBS) \
214 + $(EFENCE_LIBS) $(HOWL_LIBS) $(AVAHI_LIBS) $(EXTRA_LIBS)
215 +
216 EXTRA_DIST = mDNS.c mDNSClientAPI.h mDNSDebug.h mDNSPosix.c \
217 mDNSUNP.c mDNSPlatformFunctions.h mDNSPosix.h mDNSUNP.h \
218 rend-howl.c rend-posix.c rend-osx.c db-memory.c \
219
220
221
222 1.1 media-sound/mt-daapd/files/digest-mt-daapd-0.2.4.1
223
224 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mt-daapd/files/digest-mt-daapd-0.2.4.1?rev=1.1&view=markup
225 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/mt-daapd/files/digest-mt-daapd-0.2.4.1?rev=1.1&content-type=text/plain
226
227 Index: digest-mt-daapd-0.2.4.1
228 ===================================================================
229 MD5 8117141e8a88bfab54fe98b6bbd5cb3a mt-daapd-0.2.4.1.tar.gz 433226
230 RMD160 c4e352c610040a99a713b220e234de32f218beb9 mt-daapd-0.2.4.1.tar.gz 433226
231 SHA256 bf11f272014835b0771b1788fc7e4362c478ef3fe5ce7d945fa31480ed5f3e86 mt-daapd-0.2.4.1.tar.gz 433226
232
233
234
235 --
236 gentoo-commits@g.o mailing list
Report Message
Find on MARC Find on Google Groups