[patch] Patch for ushare-1.1a.

ushare-1.1a.patch (text/plain), 4.35 KB, created by Tobias Reese on 2010-10-27 14:44:50 UTC

diff -crB /usr/portage/media-video/ushare/Manifest ./Manifest
*** /usr/portage/media-video/ushare/Manifest	Tue Dec 29 06:36:22 2009
--- ./Manifest	Wed Oct 27 16:33:56 2010
***************
*** 1,6 ****
  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 610 RMD160 62969eca5434acea74b94f9f7100405cab9ccb16 SHA1 7435dea800f3809c5386310195c46870ce0f8735 SHA256 e7ddbcc4af37bdb8ebc0226ca57fbffd911e8e620335f711925d643c8394d35f
  MISC metadata.xml 317 RMD160 99f736c1280d43332906805dbef8b44ce79aba6e SHA1 240b0fc4e6b35df3d600b861507cd0053aebba01 SHA256 6e0c6717c1e0982384eb2b3c9357414f6e2476366ec0227b79718bb1444fa182
--- 1,7 ----
+ AUX ushare-mp4-support.patch 605 RMD160 cdb222cddb1b4916ec0f96ce00a3e1016f0855c8 SHA1 374a8c5792c54267c7ece9a420d5bed5306482cd SHA256 1cf93c0b988725be7b619e6148cafad1f17a3a632949aade7990818620549774
  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 1554 RMD160 edfcc91b9a55272555221cc1d906cbbf28d3d0a2 SHA1 7aecb6a979ba3a5b394aef32c010fe19c976f028 SHA256 1550ab3f22131c1080426ce7822f97048c0b0d48faf868385abf3ca92f4bc6a1
  MISC ChangeLog 610 RMD160 62969eca5434acea74b94f9f7100405cab9ccb16 SHA1 7435dea800f3809c5386310195c46870ce0f8735 SHA256 e7ddbcc4af37bdb8ebc0226ca57fbffd911e8e620335f711925d643c8394d35f
  MISC metadata.xml 317 RMD160 99f736c1280d43332906805dbef8b44ce79aba6e SHA1 240b0fc4e6b35df3d600b861507cd0053aebba01 SHA256 6e0c6717c1e0982384eb2b3c9357414f6e2476366ec0227b79718bb1444fa182
Only in ./files: ushare-mp4-support.patch
diff -crB /usr/portage/media-video/ushare/ushare-1.1a.ebuild ./ushare-1.1a.ebuild
*** /usr/portage/media-video/ushare/ushare-1.1a.ebuild	Tue Dec 29 06:36:22 2009
--- ./ushare-1.1a.ebuild	Wed Oct 27 16:42:47 2010
***************
*** 4,9 ****
--- 4,10 ----
  
  inherit eutils
  
+ EAPI="2"
  DESCRIPTION="uShare is a UPnP (TM) A/V & DLNA Media Server"
  HOMEPAGE="http://ushare.geexbox.org/"
  SRC_URI="http://ushare.geexbox.org/releases/${P}.tar.bz2"
***************
*** 18,38 ****
  DEPEND="${RDEPEND}
  	dev-util/pkgconfig"
  
! src_compile() {
! 	local myconf
! 	myconf="--prefix=/usr --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"
  }
  
--- 19,45 ----
  DEPEND="${RDEPEND}
  	dev-util/pkgconfig"
  
! src_prepare() {
! 	epatch "${FILESDIR}/ushare-mp4-support.patch"
  
! 	elog "Replacing Original init.d File"
  	sed -i \
  		-e '/(INSTALL) -d $(sysconfdir)\/init\.d/d' \
  		-e '/$(INSTALL) -m 755 $(INITD_FILE) $(sysconfdir)\/init.d/d' \
  		scripts/Makefile || die
+ }
+ 
+ src_configure() {
+ 	local myconf
+ 
+ 	myconf="--prefix=/usr --disable-strip $(use_enable dlna)"
+ 	# nls can only be disabled, on by default.
+ 	use nls || myconf="${myconf} --disable-nls"
  
  	./configure ${myconf} || die "Configure failed"
+ }
  
+ src_compile() {
  	emake || die "Make failed"
  }