/[gentoo-x86]/media-video/ushare/files/01_all_ushare_build_system.patch
Gentoo

Contents of /media-video/ushare/files/01_all_ushare_build_system.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Mon Apr 2 19:14:04 2012 UTC (2 years, 3 months ago) by pacho
Branch: MAIN
CVS Tags: HEAD
Revision bump fixing tons of bugs and with a new maintainer by #403979. Thanks a lot to Sal Gonzalez for his work. Remove old.

(Portage version: 2.1.10.54/cvs/Linux x86_64)

1 diff -uNr ushare-1.1a/configure ushare-1.1b/configure
2 --- ushare-1.1a/configure 2007-12-09 08:03:36.000000000 -0500
3 +++ ushare-1.1b/configure 2012-03-25 17:35:07.000000000 -0400
4 @@ -42,6 +42,9 @@
5 echo " --with-libdlna-dir=DIR check for libdlna installed in DIR"
6 echo ""
7 echo "Advanced options (experts only):"
8 + echo " --disable-sysconf disable installation of init files"
9 + echo " --enable-developer enable developer options"
10 + echo " --disable-developer disable developer options"
11 echo " --enable-debug enable debugging symbols"
12 echo " --disable-debug disable debugging symbols"
13 echo " --disable-strip disable stripping of executables at installation"
14 @@ -164,6 +167,11 @@
15 echo "#define $1 \"$2\"" >> $CONFIG_H
16 }
17
18 +check_cmd_exists(){
19 + log check_cmd_exists "$@"
20 + which "$@" >>$logfile 2>&1
21 +}
22 +
23 check_cmd(){
24 log "$@"
25 "$@" >>$logfile 2>&1
26 @@ -300,13 +308,15 @@
27 strip="strip"
28 cpu=`uname -m`
29 optimize="yes"
30 +sysconf="yes"
31 +developer="no"
32 debug="no"
33 dostrip="yes"
34 extralibs=""
35 installstrip="-s"
36 cross_compile="no"
37 INSTALL="/usr/bin/install -c"
38 -VERSION="1.1a"
39 +VERSION="1.2.0"
40 system_name=`uname -s 2>&1`
41
42 #################################################
43 @@ -420,6 +430,12 @@
44 ;;
45 --disable-dlna) dlna="no"
46 ;;
47 + --disable-sysconf) sysconf="no"
48 + ;;
49 + --enable-developer) developer="yes"
50 + ;;
51 + --disable-developer) developer="no"
52 + ;;
53 --enable-debug) debug="yes"
54 ;;
55 --disable-debug) debug="no"
56 @@ -584,6 +600,25 @@
57 linux && add_cflags -D_GNU_SOURCE
58
59 #################################################
60 +# check for developer options
61 +#################################################
62 +if enabled developer; then
63 + add_cflags -Werror
64 + add_cflags -DHAVE_DEVELOPER
65 +
66 + have_ctags='no'
67 + if check_cmd_exists 'ctags'; then
68 + have_ctags='yes'
69 + fi
70 +
71 + have_etags='no'
72 + if check_cmd_exists 'etags'; then
73 + have_etags='yes'
74 + fi
75 +
76 +fi
77 +
78 +#################################################
79 # check for debug symbols
80 #################################################
81 if enabled debug; then
82 @@ -684,6 +719,8 @@
83 echolog " STRIP $strip"
84 echolog " make $make"
85 echolog " CPU $cpu ($tune)"
86 +echolog " install sysconf $sysconf"
87 +echolog " developer options $developer"
88 echolog " debug symbols $debug"
89 echolog " strip symbols $dostrip"
90 echolog " optimize $optimize"
91 @@ -724,6 +761,10 @@
92 append_config "LDFLAGS=$LDFLAGS"
93 append_config "INSTALL=$INSTALL"
94
95 +append_config "INSTALL_SYSCONF=$sysconf"
96 +append_config "DEVELOPER=$developer"
97 +append_config "HAVE_CTAGS=$have_ctags"
98 +append_config "HAVE_ETAGS=$have_etags"
99 append_config "DEBUG=$debug"
100
101
102 diff -uNr ushare-1.1a/scripts/Makefile ushare-1.1b/scripts/Makefile
103 --- ushare-1.1a/scripts/Makefile 2007-12-09 08:03:36.000000000 -0500
104 +++ ushare-1.1b/scripts/Makefile 2012-03-25 17:35:07.000000000 -0400
105 @@ -3,6 +3,11 @@
106 endif
107 include ../config.mak
108
109 +INSTALL_RULES =
110 +ifeq ($(INSTALL_SYSCONF),yes)
111 + INSTALL_RULES += install-sysconf
112 +endif
113 +
114 CONF_FILE = "ushare.conf"
115 INITD_FILE = "ushare"
116
117 @@ -14,7 +19,9 @@
118
119 distclean:
120
121 -install:
122 +install: $(INSTALL_RULES)
123 +
124 +install-sysconf:
125 $(INSTALL) -d $(sysconfdir)
126 $(INSTALL) -m 644 $(CONF_FILE) $(sysconfdir)
127 $(INSTALL) -d $(sysconfdir)/init.d
128 diff -uNr ushare-1.1a/src/Makefile ushare-1.1b/src/Makefile
129 --- ushare-1.1a/src/Makefile 2007-12-09 08:03:36.000000000 -0500
130 +++ ushare-1.1b/src/Makefile 2012-03-25 17:35:07.000000000 -0400
131 @@ -3,6 +3,15 @@
132 endif
133 include ../config.mak
134
135 +ifeq ($(DEVELOPER),yes)
136 + ifeq ($(HAVE_ETAGS),yes)
137 + BUILD_RULES += TAGS
138 + endif
139 + ifeq ($(HAVE_CTAGS),yes)
140 + BUILD_RULES += tags
141 + endif
142 +endif
143 +
144 PROG = ushare
145
146 EXTRADIST = ushare.1 \
147 @@ -50,7 +59,7 @@
148
149 .SUFFIXES: .c .o
150
151 -all: depend $(PROG)
152 +all: depend $(BUILD_RULES) $(PROG)
153
154 .c.o:
155 $(CC) -c $(CFLAGS) $(OPTFLAGS) -o $@ $<
156 @@ -58,6 +67,14 @@
157 $(PROG): $(OBJS)
158 $(CC) $(OBJS) $(LDFLAGS) $(EXTRALIBS) -o $@
159
160 +TAGS:
161 + @rm -f $@; \
162 + ( find -name '*.[chS]' -print ) | xargs etags -a
163 +
164 +tags:
165 + @rm -f $@; \
166 + ( find -name '*.[chS]' -print ) | xargs ctags -a;
167 +
168 clean:
169 -$(RM) -f *.o $(PROG)
170 -$(RM) -f .depend

  ViewVC Help
Powered by ViewVC 1.1.20