diff options
| -rw-r--r-- | media-video/ushare/ChangeLog | 12 | ||||
| -rw-r--r-- | media-video/ushare/Manifest | 19 | ||||
| -rw-r--r-- | media-video/ushare/files/01_all_ushare_build_system.patch | 170 | ||||
| -rw-r--r-- | media-video/ushare/files/02_all_ushare_build_warnings.patch | 35 | ||||
| -rw-r--r-- | media-video/ushare/files/03_all_ushare_mp4_video_mime.patch | 20 | ||||
| -rw-r--r-- | media-video/ushare/metadata.xml | 15 | ||||
| -rw-r--r-- | media-video/ushare/ushare-1.1a-r1.ebuild (renamed from media-video/ushare/ushare-1.1a.ebuild) | 41 |
7 files changed, 281 insertions, 31 deletions
diff --git a/media-video/ushare/ChangeLog b/media-video/ushare/ChangeLog index 1ecfdb02fffd..7e26c28f7795 100644 --- a/media-video/ushare/ChangeLog +++ b/media-video/ushare/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for media-video/ushare # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ChangeLog,v 1.3 2012/02/03 22:10:52 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ChangeLog,v 1.4 2012/04/02 19:14:03 pacho Exp $ + +*ushare-1.1a-r1 (02 Apr 2012) + + 02 Apr 2012; Pacho Ramos <pacho@gentoo.org> + +files/01_all_ushare_build_system.patch, + +files/02_all_ushare_build_warnings.patch, + +files/03_all_ushare_mp4_video_mime.patch, +ushare-1.1a-r1.ebuild, + -ushare-1.1a.ebuild, metadata.xml: + Revision bump fixing tons of bugs and with a new maintainer by #403979. Thanks + a lot to Sal Gonzalez for his work. Remove old. 03 Feb 2012; Jeremy Olexa <darkside@gentoo.org> metadata.xml: orphan package because I am not interested any longer diff --git a/media-video/ushare/Manifest b/media-video/ushare/Manifest index 68af10d44052..95c7159a5bf7 100644 --- a/media-video/ushare/Manifest +++ b/media-video/ushare/Manifest @@ -1,6 +1,19 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX 01_all_ushare_build_system.patch 4276 RMD160 b646d374e9983c5b3e9f585b5fb8fe3dbc6e55d3 SHA1 d153c028bc3df44e106215614f11e1e6dde5ded1 SHA256 6455181cd32b9962de2dddc0140201a56c0dc21e161f8a24bf9f037de012e3f9 +AUX 02_all_ushare_build_warnings.patch 989 RMD160 3dd83946c30e801a9edf85e1bda3b92a67b6eae4 SHA1 0e9633594494c073e178c2803fb0b019b1f1d64e SHA256 5c35ace53d189726459eb4d45f05430eeb854eec411bd0f46b0b3fcb4ad682ce +AUX 03_all_ushare_mp4_video_mime.patch 971 RMD160 9ea7b04396345014b8e99f27279984e588388ac3 SHA1 2a0eeea248e91a8866ce0367e10ea7189a8b61a7 SHA256 b44ea6fdde6af5e978cc9c76945feed8ed0cdac76be9b1777e0849dae44fb0f0 AUX ushare.conf.d 896 RMD160 8bf9d92633778a80a7492f8de120d03ca9d33a0d SHA1 d87f3bf5f813dc1a567d49c81809f57788b56036 SHA256 cf333cc495177828c8a5bf3fde9462190435843ffd51d95ef676c3c6df1c5563 AUX ushare.init.d 2164 RMD160 adbee9c14af514ca8c91dfd0c9f37114828965ee SHA1 cde78bc810b58a2e1d7c2564750f38f81d325fb4 SHA256 7a8c4c06aacf9a87ae2036df24751a74a29e741a39e89e0c704c63a27ad2a4c2 DIST ushare-1.1a.tar.bz2 65864 RMD160 6194ffec031d20fd897f2c7cf71c3c810238713f SHA1 1539e83cde5d80f433d262d971f5fe78486c9375 SHA256 7b9b85c79968d4f4560f02a99e33c6a33ff58f9d41d8faea79e31cce2ee78665 -EBUILD ushare-1.1a.ebuild 1484 RMD160 ad2822145045ee4cae54c2e78792265474e8ea18 SHA1 fd7b9444c95dfc5bfbd54626a22b3f77a70f70af SHA256 a03b18019162d3fad929c139c69465438bd8e5a9f2436713d07f6d5bf7ef84ba -MISC ChangeLog 731 RMD160 dacd71db5552e65db52d89675bceb482cc8b37b4 SHA1 f85eb58f22b38c97fcc90fb16c31d12e4204df56 SHA256 72822e8f8e17414bd63b6d6dfdfc38a1d728e72f0e21904af70073d88717c38d -MISC metadata.xml 313 RMD160 1bbcfdc465fac5f911134d9040b15cea367bd67d SHA1 d6b349fc09b5528f8a0b76fc3bfc15ba66ddd702 SHA256 3199b4720f1ada09b0d708de6ad2844863cdff85c524f6f58608cc873c20fd50 +EBUILD ushare-1.1a-r1.ebuild 1396 RMD160 e5529095ec7da9048a84f7aa354715322d5e1433 SHA1 12fd80a2d8c2f48bc7ef5887722b311e5c1c84cf SHA256 09a923a7ac683d5da0449b2a37368082eec759bb24fe3900f14d3182062e6645 +MISC ChangeLog 1131 RMD160 3f2f542fc5997b7366bf5e51574ff9a0797a960c SHA1 f831e4785d34d9d1aaa180037e692693001e61b5 SHA256 6cf55ea87318c5d7deb35000d5e6f062d3b9d96e657127ad881d6bd34edf60b7 +MISC metadata.xml 407 RMD160 b3d1e6f28ce77646da192d9a8257ae71903235b7 SHA1 6f81856c98942d69c3f170946f71b3191977b3f4 SHA256 84d3e1691781da3fbc0304d3a0263cf1f456942a6b26140b4296c937df057f8f +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk95+oEACgkQCaWpQKGI+9Se/QCeMLuFWFQcrKIwMK1Y3o5wmjVS +hB8AnimoQpgDWtdAho2ESHdG6F349j4b +=Occp +-----END PGP SIGNATURE----- diff --git a/media-video/ushare/files/01_all_ushare_build_system.patch b/media-video/ushare/files/01_all_ushare_build_system.patch new file mode 100644 index 000000000000..c635bd7d52f4 --- /dev/null +++ b/media-video/ushare/files/01_all_ushare_build_system.patch @@ -0,0 +1,170 @@ +diff -uNr ushare-1.1a/configure ushare-1.1b/configure +--- ushare-1.1a/configure 2007-12-09 08:03:36.000000000 -0500 ++++ ushare-1.1b/configure 2012-03-25 17:35:07.000000000 -0400 +@@ -42,6 +42,9 @@ + echo " --with-libdlna-dir=DIR check for libdlna installed in DIR" + echo "" + echo "Advanced options (experts only):" ++ echo " --disable-sysconf disable installation of init files" ++ echo " --enable-developer enable developer options" ++ echo " --disable-developer disable developer options" + echo " --enable-debug enable debugging symbols" + echo " --disable-debug disable debugging symbols" + echo " --disable-strip disable stripping of executables at installation" +@@ -164,6 +167,11 @@ + echo "#define $1 \"$2\"" >> $CONFIG_H + } + ++check_cmd_exists(){ ++ log check_cmd_exists "$@" ++ which "$@" >>$logfile 2>&1 ++} ++ + check_cmd(){ + log "$@" + "$@" >>$logfile 2>&1 +@@ -300,13 +308,15 @@ + strip="strip" + cpu=`uname -m` + optimize="yes" ++sysconf="yes" ++developer="no" + debug="no" + dostrip="yes" + extralibs="" + installstrip="-s" + cross_compile="no" + INSTALL="/usr/bin/install -c" +-VERSION="1.1a" ++VERSION="1.2.0" + system_name=`uname -s 2>&1` + + ################################################# +@@ -420,6 +430,12 @@ + ;; + --disable-dlna) dlna="no" + ;; ++ --disable-sysconf) sysconf="no" ++ ;; ++ --enable-developer) developer="yes" ++ ;; ++ --disable-developer) developer="no" ++ ;; + --enable-debug) debug="yes" + ;; + --disable-debug) debug="no" +@@ -584,6 +600,25 @@ + linux && add_cflags -D_GNU_SOURCE + + ################################################# ++# check for developer options ++################################################# ++if enabled developer; then ++ add_cflags -Werror ++ add_cflags -DHAVE_DEVELOPER ++ ++ have_ctags='no' ++ if check_cmd_exists 'ctags'; then ++ have_ctags='yes' ++ fi ++ ++ have_etags='no' ++ if check_cmd_exists 'etags'; then ++ have_etags='yes' ++ fi ++ ++fi ++ ++################################################# + # check for debug symbols + ################################################# + if enabled debug; then +@@ -684,6 +719,8 @@ + echolog " STRIP $strip" + echolog " make $make" + echolog " CPU $cpu ($tune)" ++echolog " install sysconf $sysconf" ++echolog " developer options $developer" + echolog " debug symbols $debug" + echolog " strip symbols $dostrip" + echolog " optimize $optimize" +@@ -724,6 +761,10 @@ + append_config "LDFLAGS=$LDFLAGS" + append_config "INSTALL=$INSTALL" + ++append_config "INSTALL_SYSCONF=$sysconf" ++append_config "DEVELOPER=$developer" ++append_config "HAVE_CTAGS=$have_ctags" ++append_config "HAVE_ETAGS=$have_etags" + append_config "DEBUG=$debug" + + +diff -uNr ushare-1.1a/scripts/Makefile ushare-1.1b/scripts/Makefile +--- ushare-1.1a/scripts/Makefile 2007-12-09 08:03:36.000000000 -0500 ++++ ushare-1.1b/scripts/Makefile 2012-03-25 17:35:07.000000000 -0400 +@@ -3,6 +3,11 @@ + endif + include ../config.mak + ++INSTALL_RULES = ++ifeq ($(INSTALL_SYSCONF),yes) ++ INSTALL_RULES += install-sysconf ++endif ++ + CONF_FILE = "ushare.conf" + INITD_FILE = "ushare" + +@@ -14,7 +19,9 @@ + + distclean: + +-install: ++install: $(INSTALL_RULES) ++ ++install-sysconf: + $(INSTALL) -d $(sysconfdir) + $(INSTALL) -m 644 $(CONF_FILE) $(sysconfdir) + $(INSTALL) -d $(sysconfdir)/init.d +diff -uNr ushare-1.1a/src/Makefile ushare-1.1b/src/Makefile +--- ushare-1.1a/src/Makefile 2007-12-09 08:03:36.000000000 -0500 ++++ ushare-1.1b/src/Makefile 2012-03-25 17:35:07.000000000 -0400 +@@ -3,6 +3,15 @@ + endif + include ../config.mak + ++ifeq ($(DEVELOPER),yes) ++ ifeq ($(HAVE_ETAGS),yes) ++ BUILD_RULES += TAGS ++ endif ++ ifeq ($(HAVE_CTAGS),yes) ++ BUILD_RULES += tags ++ endif ++endif ++ + PROG = ushare + + EXTRADIST = ushare.1 \ +@@ -50,7 +59,7 @@ + + .SUFFIXES: .c .o + +-all: depend $(PROG) ++all: depend $(BUILD_RULES) $(PROG) + + .c.o: + $(CC) -c $(CFLAGS) $(OPTFLAGS) -o $@ $< +@@ -58,6 +67,14 @@ + $(PROG): $(OBJS) + $(CC) $(OBJS) $(LDFLAGS) $(EXTRALIBS) -o $@ + ++TAGS: ++ @rm -f $@; \ ++ ( find -name '*.[chS]' -print ) | xargs etags -a ++ ++tags: ++ @rm -f $@; \ ++ ( find -name '*.[chS]' -print ) | xargs ctags -a; ++ + clean: + -$(RM) -f *.o $(PROG) + -$(RM) -f .depend diff --git a/media-video/ushare/files/02_all_ushare_build_warnings.patch b/media-video/ushare/files/02_all_ushare_build_warnings.patch new file mode 100644 index 000000000000..f79e7890f8c0 --- /dev/null +++ b/media-video/ushare/files/02_all_ushare_build_warnings.patch @@ -0,0 +1,35 @@ +diff --git a/src/ctrl_telnet.c b/src/ctrl_telnet.c +index 0849d80..b3e9e8d 100644 +--- a/src/ctrl_telnet.c ++++ b/src/ctrl_telnet.c +@@ -202,6 +202,7 @@ ctrl_telnet_start (int port) + void + ctrl_telnet_stop (void) + { ++ ssize_t tmp; + pthread_mutex_lock (&startstop_lock); + + if (!started) +@@ -211,7 +212,7 @@ ctrl_telnet_stop (void) + } + + /* yes is int, which is bigger then char, so this should be safe */ +- write (ttd.killer[1], &yes, sizeof (char)); ++ tmp = write (ttd.killer[1], &yes, sizeof (char)); + + pthread_mutex_unlock (&startstop_lock); + pthread_join (ttd.thread, NULL); +diff --git a/src/mime.c b/src/mime.c +index 66c48ab..bf0121b 100644 +--- a/src/mime.c ++++ b/src/mime.c +@@ -144,7 +144,8 @@ char *mime_get_protocol (struct mime_type_t *mime) + if (!mime) + return NULL; + +- sprintf (protocol, mime->mime_protocol); ++ //sprintf (protocol, mime->mime_protocol); ++ strcpy (protocol, mime->mime_protocol); + strcat (protocol, "*"); + return strdup (protocol); + } diff --git a/media-video/ushare/files/03_all_ushare_mp4_video_mime.patch b/media-video/ushare/files/03_all_ushare_mp4_video_mime.patch new file mode 100644 index 000000000000..0edba22cba94 --- /dev/null +++ b/media-video/ushare/files/03_all_ushare_mp4_video_mime.patch @@ -0,0 +1,20 @@ +diff --git a/src/mime.c b/src/mime.c +index bf0121b..f38deca 100644 +--- a/src/mime.c ++++ b/src/mime.c +@@ -53,6 +53,7 @@ const struct mime_type_t MIME_Type_List[] = { + { "mpeg2", UPNP_VIDEO, "http-get:*:video/mpeg2:"}, + { "m4v", UPNP_VIDEO, "http-get:*:video/mp4:"}, + { "m4p", UPNP_VIDEO, "http-get:*:video/mp4:"}, ++ { "mp4", UPNP_VIDEO, "http-get:*:video/mp4:"}, + { "mp4ps", UPNP_VIDEO, "http-get:*:video/x-nerodigital-ps:"}, + { "ts", UPNP_VIDEO, "http-get:*:video/mpeg2:"}, + { "ogm", UPNP_VIDEO, "http-get:*:video/mpeg:"}, +@@ -79,7 +80,6 @@ const struct mime_type_t MIME_Type_List[] = { + { "mp1", UPNP_AUDIO, "http-get:*:audio/mp1:"}, + { "mp2", UPNP_AUDIO, "http-get:*:audio/mp2:"}, + { "mp3", UPNP_AUDIO, "http-get:*:audio/mpeg:"}, +- { "mp4", UPNP_AUDIO, "http-get:*:audio/mp4:"}, + { "m4a", UPNP_AUDIO, "http-get:*:audio/mp4:"}, + { "ogg", UPNP_AUDIO, "http-get:*:audio/x-ogg:"}, + { "wav", UPNP_AUDIO, "http-get:*:audio/wav:"}, diff --git a/media-video/ushare/metadata.xml b/media-video/ushare/metadata.xml index 172b5ec4970a..c73308b96086 100644 --- a/media-video/ushare/metadata.xml +++ b/media-video/ushare/metadata.xml @@ -1,10 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer> - <email>maintainer-needed@gentoo.org</email> - </maintainer> - <use> - <flag name='dlna'>Add DLNA (<pkg>media-libs/libdlna</pkg>) support</flag> - </use> +<herd>proxy-maintainers</herd> +<maintainer> + <email>blef@codejunkie.net</email> + <name>Sal Gonzalez</name> + <description>Maintainer. Assign bugs to him</description> +</maintainer> +<use> + <flag name='dlna'>Add DLNA (<pkg>media-libs/libdlna</pkg>) support</flag> +</use> </pkgmetadata> diff --git a/media-video/ushare/ushare-1.1a.ebuild b/media-video/ushare/ushare-1.1a-r1.ebuild index 09bdb947e036..277616b13c2f 100644 --- a/media-video/ushare/ushare-1.1a.ebuild +++ b/media-video/ushare/ushare-1.1a-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ushare-1.1a.ebuild,v 1.2 2009/12/29 05:21:57 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ushare-1.1a-r1.ebuild,v 1.1 2012/04/02 19:14:03 pacho Exp $ -inherit eutils +EAPI=4 +inherit eutils multilib DESCRIPTION="uShare is a UPnP (TM) A/V & DLNA Media Server" HOMEPAGE="http://ushare.geexbox.org/" @@ -14,34 +15,32 @@ KEYWORDS="~amd64 ~x86" IUSE="dlna nls" RDEPEND="net-libs/libupnp - dlna? ( media-libs/libdlna )" + dlna? ( >=media-libs/libdlna-0.2.4 )" DEPEND="${RDEPEND} dev-util/pkgconfig" -src_compile() { +src_prepare() { + EPATCH_SOURCE="${FILESDIR}" EPATCH_SUFFIX="patch" \ + EPATCH_OPTS="-p1" epatch +} + +src_configure() { local myconf - myconf="--prefix=/usr --disable-strip $(use_enable dlna)" + myconf="--prefix=/usr --disable-sysconf --disable-strip $(use_enable dlna)" # nls can only be disabled, on by default. use nls || myconf="${myconf} --disable-nls" - # remove original init.d - sed -i \ - -e '/(INSTALL) -d $(sysconfdir)\/init\.d/d' \ - -e '/$(INSTALL) -m 755 $(INITD_FILE) $(sysconfdir)\/init.d/d' \ - scripts/Makefile || die - - # note: homegrown configure, careful. - ./configure ${myconf} || die "Configure failed" - - emake || die "Make failed" + # I can't use econf + # --host is not implemented in ./configure file + ./configure ${myconf} || die "./configure failed" } src_install() { - emake DESTDIR="${D}" install || die "make install failed" - doman src/ushare.1 || die - newconfd "${FILESDIR}"/ushare.conf.d ushare || die - newinitd "${FILESDIR}"/ushare.init.d ushare || die - dodoc NEWS README TODO THANKS AUTHORS || die + emake DESTDIR="${D}" install + doman src/ushare.1 + newconfd "${FILESDIR}"/ushare.conf.d ushare + newinitd "${FILESDIR}"/ushare.init.d ushare + dodoc NEWS README TODO THANKS AUTHORS } pkg_postinst() { |