summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2012-04-02 19:14:04 +0000
committerPacho Ramos <pacho@gentoo.org>2012-04-02 19:14:04 +0000
commit775c18832bcf952a735da0ef4ff9976acb75611e (patch)
treef9a0707fa1f522702a2273f9877b7c9ca22188e8 /media-video
parentAdd patch to fix underlinking detected by gold, https://bugzilla.gnome.org/sh... (diff)
downloadgentoo-2-775c18832bcf952a735da0ef4ff9976acb75611e.tar.gz
gentoo-2-775c18832bcf952a735da0ef4ff9976acb75611e.tar.bz2
gentoo-2-775c18832bcf952a735da0ef4ff9976acb75611e.zip
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)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/ushare/ChangeLog12
-rw-r--r--media-video/ushare/files/01_all_ushare_build_system.patch170
-rw-r--r--media-video/ushare/files/02_all_ushare_build_warnings.patch35
-rw-r--r--media-video/ushare/files/03_all_ushare_mp4_video_mime.patch20
-rw-r--r--media-video/ushare/metadata.xml15
-rw-r--r--media-video/ushare/ushare-1.1a-r1.ebuild (renamed from media-video/ushare/ushare-1.1a.ebuild)41
6 files changed, 265 insertions, 28 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/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() {