rpms/live555/F-9 live.2008.02.08-shared.patch, NONE, 1.1 live.2008.04.03-reorder.patch, NONE, 1.1 live555.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/free/rpms/live555/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28701

Modified Files:
	.cvsignore sources 
Added Files:
	live.2008.02.08-shared.patch live.2008.04.03-reorder.patch 
	live555.spec 
Log Message:
- initial import into F-9 branch (copied from devel)


live.2008.02.08-shared.patch:

--- NEW FILE live.2008.02.08-shared.patch ---
diff -up live/config.linux.shared live/config.linux
--- live/config.linux.shared	2008-04-23 17:09:41.000000000 +0200
+++ live/config.linux	2008-04-23 17:12:00.000000000 +0200
@@ -9,9 +9,9 @@ OBJ =			o
 LINK =			c++ -o
 LINK_OPTS =		-L.
 CONSOLE_LINK_OPTS =	$(LINK_OPTS)
-LIBRARY_LINK =		ar rcvu 
-LIBRARY_LINK_OPTS =	
-LIB_SUFFIX =			a
+LIBRARY_LINK =		$(CC) -o 
+LIBRARY_LINK_OPTS =	$(LINK_OPTS) -shared -Wl,-soname,$@.$(SO_VERSION) $(LIBADDS)
+LIB_SUFFIX =			so
 LIBS_FOR_CONSOLE_APPLICATION =
 LIBS_FOR_GUI_APPLICATION =
 EXE =

live.2008.04.03-reorder.patch:

--- NEW FILE live.2008.04.03-reorder.patch ---
diff -up live/Makefile.tail.reorder live/Makefile.tail
--- live/Makefile.tail.reorder	2008-04-24 01:42:06.000000000 +0200
+++ live/Makefile.tail	2008-04-24 01:48:48.000000000 +0200
@@ -15,10 +15,10 @@ TESTPROGS_APP = $(TESTPROGS_DIR)/testMP3
 MEDIA_SERVER_DIR = mediaServer
 MEDIA_SERVER_APP = $(MEDIA_SERVER_DIR)/mediaServer$(EXE)
 
-ALL =	$(LIVEMEDIA_LIB) \
-	$(GROUPSOCK_LIB) \
+ALL =	$(BASIC_USAGE_ENVIRONMENT_LIB) \
 	$(USAGE_ENVIRONMENT_LIB) \
-	$(BASIC_USAGE_ENVIRONMENT_LIB) \
+	$(GROUPSOCK_LIB) \
+	$(LIVEMEDIA_LIB) \
 	$(TESTPROGS_APP) \
 	$(MEDIA_SERVER_APP)
 all:	$(ALL)


--- NEW FILE live555.spec ---
%define		date	2008.07.25
%define		live_soversion 0

Name:		live555
Version:	0
Release:	0.20.%{date}%{?dist}
Summary:	Live555.com streaming libraries

Group:		System Environment/Libraries
License:	LGPLv2+
URL:		http://live555.com/liveMedia/
Source0:	http://live555.com/liveMedia/public/live.%{date}.tar.gz
# http://live555.com/liveMedia/public/changelog.txt
Source1:	changelog.txt
Patch0:		http://ftp.debian.org/debian/pool/main/libl/liblivemedia/liblivemedia_2007.02.20-2.diff.gz
Patch1:		live.2008.02.08-shared.patch
Patch2:		live.2008.04.03-reorder.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
This code forms a set of C++ libraries for multimedia streaming, 
using open standard protocols (RTP/RTCP, RTSP, SIP). These 
libraries - which can be compiled for Unix (including Linux and Mac OS X), 
Windows, and QNX (and other POSIX-compliant systems) - can be used 
to build streaming applications.
The libraries can also be used to stream, receive, and process MPEG, 
H.263+ or JPEG video, and several audio codecs. They can easily be 
extended to support additional (audio and/or video) codecs, and can 
also be used to build basic RTSP or SIP clients and servers, and have 
been used to add streaming support to existing media player applications.

%package	devel
Summary:	Development files for live555.com streaming libraries
Group:		Development/Libraries
Requires:	%{name} = %{version}-%{release}
Obsoletes:	live-devel < 0-0.19.2008.04.03
Provides:	live-devel = %{version}-%{release}

%description	devel
This code forms a set of C++ libraries for multimedia streaming, 
using open standard protocols (RTP/RTCP, RTSP, SIP). These 
libraries - which can be compiled for Unix (including Linux and Mac OS X), 
Windows, and QNX (and other POSIX-compliant systems) - can be used 
to build streaming applications.
The libraries can also be used to stream, receive, and process MPEG, 
H.263+ or JPEG video, and several audio codecs. They can easily be 
extended to support additional (audio and/or video) codecs, and can 
also be used to build basic RTSP or SIP clients and servers, and have 
been used to add streaming support to existing media player applications.

%package	tools
Summary:	RTSP streaming tools using live555.com streaming libraries
Group:		Applications/Multimedia
Requires:	%{name} = %{version}-%{release}
Obsoletes:	live-tools < 0-0.19.2008.04.03
Provides:	live-tools = %{version}-%{release}

%description	tools
This code forms a set of C++ libraries for multimedia streaming, 
using open standard protocols (RTP/RTCP, RTSP, SIP). These 
libraries - which can be compiled for Unix (including Linux and Mac OS X), 
Windows, and QNX (and other POSIX-compliant systems) - can be used 
to build streaming applications.
The libraries can also be used to stream, receive, and process MPEG, 
H.263+ or JPEG video, and several audio codecs. They can easily be 
extended to support additional (audio and/or video) codecs, and can 
also be used to build basic RTSP or SIP clients and servers, and have 
been used to add streaming support to existing media player applications.

This package contains the live555.com streaming server
(live555MediaServer), the example programs (openRTSP, playSIP, sapWatch,
vobStreamer) and a variety of test tools.

%package	static
Summary:	Static libraries for %{name}
Group:		Development/Libraries
Requires:	%{name}-devel = %{version}-%{release}

%description	static
The %{name}-static package contains static libraries for
developing applications that use %{name}.

%prep
%setup -q -n live
%patch0 -p1
patch -p1 -i debian/patches/010_propagate_cflags.diff
patch -p1 -i debian/patches/010_proper_link_order.diff
patch -p1 -i debian/patches/010_static_link.diff
patch -p1 -i debian/patches/020_cxx_headers.diff
patch -p1 -i debian/patches/020_invalid_casts.diff
patch -p1 -i debian/patches/021_ip_mreq_source.diff
cp -p %{SOURCE1} .
%patch1 -p1 -b .static
%patch2 -p1 -b .reorder

%build
./genMakefiles %{_target_os}.static
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC"
rename .a _pic.a */*.a
mv $(find BasicUsageEnvironment groupsock liveMedia UsageEnvironment -name "*.a" ) $(pwd)
make clean
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
mv $(find BasicUsageEnvironment groupsock liveMedia UsageEnvironment -name "*.a" ) $(pwd)
make clean
# Hack to prevent undefined-non-weak-symbol
for i in groupsock liveMedia ; do
  pushd $i
  LIBADD="-lstdc++ -lpthread"
  for j in BasicUsageEnvironment groupsock liveMedia UsageEnvironment ; do
    if [ $(grep $j Makefile.head |wc -l) = 1 ] ; then
      LIBADD="$LIBADD -L../${j} -l${j}"
    fi
  done
  echo -e LIBADDS = " $LIBADD " >> Makefile.head
  popd
  pushd UsageEnvironment
    echo -e LIBADDS = -lstdc++ -L../BasicUsageEnvironment -lBasicUsageEnvironment >> Makefile.head
  popd
  pushd BasicUsageEnvironment
    echo -e LIBADDS = -lstdc++ -lpthread  >> Makefile.head
  popd
done
./genMakefiles %{_target_os}
make CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" SO_VERSION="%{live_soversion}"

# Hack to fix the circle dependency - we leave the safe parallele work here.
pushd BasicUsageEnvironment
rm *.so
make CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" SO_VERSION="%{live_soversion}" \
    LIBADDS="-lstdc++ -lpthread -L../UsageEnvironment -lUsageEnvironment"
popd

%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT{%{_libdir},%{_bindir}}
for i in BasicUsageEnvironment groupsock liveMedia UsageEnvironment ; do
  install -dm 755 $RPM_BUILD_ROOT%{_includedir}/$i
  install -pm 644 $i/include/*.h* $RPM_BUILD_ROOT%{_includedir}/$i/
  install -pm 644 lib${i}.a $RPM_BUILD_ROOT%{_libdir}/lib${i}.a
  install -pm 644 lib${i}_pic.a $RPM_BUILD_ROOT%{_libdir}/lib${i}_pic.a
  install -pm 755 $i/lib${i}.so $RPM_BUILD_ROOT%{_libdir}/lib${i}.so.%{date}
  ln -sf lib${i}.so.%{date} $RPM_BUILD_ROOT%{_libdir}/lib${i}.so.%{live_soversion}
  ln -sf lib${i}.so.%{date} $RPM_BUILD_ROOT%{_libdir}/lib${i}.so
done

install -pm755 mediaServer/live555MediaServer $RPM_BUILD_ROOT%{_bindir}

pushd testProgs
for i in \
  MPEG2TransportStreamIndexer \
  openRTSP \
  playSIP \
  sapWatch \
  testAMRAudioStreamer \
  testMP3Receiver \
  testMP3Streamer \
  testMPEG1or2AudioVideoStreamer \
  testMPEG1or2AudioVideoToDarwin \
  testMPEG1or2ProgramToTransportStream \
  testMPEG1or2Splitter \
  testMPEG1or2VideoReceiver \
  testMPEG1or2VideoStreamer \
  testMPEG2TransportStreamTrickPlay \
  testMPEG2TransportStreamer \
  testMPEG4VideoStreamer \
  testMPEG4VideoToDarwin \
  testOnDemandRTSPServer \
  testRelay \
  testWAVAudioStreamer \
  vobStreamer \
; do
  install -pm755 $i $RPM_BUILD_ROOT%{_bindir}
done
popd

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_libdir}/libBasicUsageEnvironment.so.*
%{_libdir}/libgroupsock.so.*
%{_libdir}/libliveMedia.so.*
%{_libdir}/libUsageEnvironment.so.*

%files tools
%defattr(-,root,root,-)
%{_bindir}/*

%files devel
%defattr(-,root,root,-)
%doc COPYING README changelog.txt
%{_libdir}/libBasicUsageEnvironment.so
%{_libdir}/libgroupsock.so
%{_libdir}/libliveMedia.so
%{_libdir}/libUsageEnvironment.so
%{_includedir}/BasicUsageEnvironment/
%{_includedir}/groupsock/
%{_includedir}/liveMedia/
%{_includedir}/UsageEnvironment/

%files static
%defattr(-,root,root,644)
%{_libdir}/libBasicUsageEnvironment*.a
%{_libdir}/libgroupsock*.a
%{_libdir}/libliveMedia*.a
%{_libdir}/libUsageEnvironment*.a

%changelog
* Sun Aug 17 2008 Dominik Mierzejewski <rpm[AT]greysector.net> - 0-0.20.2008.07.25
- 2008.07.25
- devel-static -> static, per Fedora guidelines
- specfile whitespace cosmetics
- made tools depend on specific version until we have a stable ABI
- added proper obsoletes/provides to devel
- made -tools binaries installation independent of umask

* Mon May  5 2008 kwizart < kwizart at gmail.com > - 0-0.19.2008.04.03
- Rename package from live to live555 
  (live555-devel-static provides live-devel for compat)
- Enable shared build
- Split static pic and nopic into devel-static

* Sun Apr 06 2008 Dominik Mierzejewski <rpm[AT]greysector.net> - 0-0.18.2008.04.03
- 2008.04.03

* Sun Feb 24 2008 Dominik Mierzejewski <rpm[AT]greysector.net> - 0-0.17.2008.02.08
- 2008.02.08
- added tools subpackage

* Sat Dec 01 2007 Dominik Mierzejewski <rpm[AT]greysector.net> - 0-0.16.2007.11.18
- 2007.11.18
- fix CVE-2007-6036 (bug #1728)
- fix license tag
- store changelog.txt locally, because the one on the website is constantly updated

* Sun May 17 2007 Dominik Mierzejewski <rpm[AT]greysector.net> - 0-0.15.2007.04.24a
- 2007.04.24a
- use Debian patches

* Mon Sep 25 2006 Dams <anvil[AT]livna.org> - 0-0.13.2006.08.07%{?dist}
- Release bump

* Fri Aug 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 0-0.12.2006.08.07
- changelog.txt changed upstream :(

* Thu Aug 10 2006 Ville Skyttä <ville.skytta at iki.fi> - 0-0.11.2006.08.07
- 2006.08.07.
- Drop no longer needed live Obsoletes and Provides.
- Install into usual system locations, ship both PIC and non-PIC libs
  (from Debian).

* Thu Jun 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 0-0.11.2006.06.22
- 2006.06.22.
- Re-enable parallel make.

* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
- add another 0 for switch cvs -> release

* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist

* Thu Feb 23 2006 Ville Skyttä <ville.skytta at iki.fi> 0-0.lvn.11.2006.02.15
- Update to 2006.02.15.

* Mon Jan 16 2006 Adrian Reber <adrian at lisas.de> - 0-0.lvn.11.2006.01.05
- Updated to 2006.01.05
- Drop Epoch

* Tue Aug  9 2005 Ville Skyttä <ville.skytta at iki.fi> 0:0-0.lvn.10.2005.08.09
- 2005.08.09.
- Rename binary package to -devel.
- Ship changelog.txt.
- Clean up unused stuff from specfile.

* Tue Dec 28 2004 Dams <anvil[AT]livna.org> - 0:0-0.lvn.10.2004.12.23
- Updated to version 2004.12.23

* Fri Nov 12 2004 Dams <anvil[AT]livna.org> - 0:0-0.lvn.9.2004.11.11a
- Updated to version 2004.11.11a

* Thu May 20 2004 Dams <anvil[AT]livna.org> - 0:0-0.lvn.8.2004.05.19
- Added Source1:changelog.txt

* Thu May 20 2004 Dams <anvil[AT]livna.org> - 0:0-0.lvn.7.2004.05.19
- Updated version
- URL in Source0

* Sun Apr  4 2004 Dams <anvil[AT]livna.org> 0:0-0.lvn.6.2004.03.31
- Removed testprograms package

* Wed Mar 31 2004 Dams <anvil[AT]livna.org> 0:0-0.lvn.5.2004.03.31
- Updated version 2004-03-31

* Wed Jan  7 2004 Dams <anvil[AT]livna.org> 0:0-0.fdr.4.2003.11.25
- Patch from Marius to make makefile honor rpm optflags
- Removed URL in Source0

* Wed Jan  7 2004 Dams <anvil[AT]livna.org> 0:0-0.fdr.3.2003.11.25
- Removed all .o files

* Fri Dec 12 2003 Dams <anvil[AT]livna.org> 0:0-0.fdr.2.2003.11.25
- Snipped the devel pacakge. 

* Fri Dec 12 2003 Dams <anvil[AT]livna.org> 0:0-0.fdr.1.2003.11.25
- Version-Release respecting fedora.us guidelines
- Spec file cleanup. 

* Sat Nov 29 2003 Peter Backlund <peter dot backlund at home dot se> - 0:0.0.2003.11.25-0.fdr.1
- Added 0.0. to version, to allow for upgrade to 0.x/1.x release
 
* Sat Nov 29 2003 Peter Backlund <peter dot backlund at home dot se> - 0:2003.11.25-0.fdr.1
- New upstream release

* Sun Nov 16 2003 Peter Backlund <peter dot backlund at home dot se> - 0:2003.11.14-0.fdr.2
- Removed unnecessary BuildReq.
- Removed smp job macro.
- Replaced sed with perl.

* Fri Nov 14 2003 Peter Backlund <peter dot backlund at home dot se> - 0:2003.11.14-0.fdr.1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/live555/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Aug 2008 16:33:43 -0000	1.1
+++ .cvsignore	18 Aug 2008 14:25:28 -0000	1.2
@@ -0,0 +1,3 @@
+live.2008.07.25.tar.gz
+changelog.txt
+liblivemedia_2007.02.20-2.diff.gz


Index: sources
===================================================================
RCS file: /cvs/free/rpms/live555/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Aug 2008 16:33:43 -0000	1.1
+++ sources	18 Aug 2008 14:25:28 -0000	1.2
@@ -0,0 +1,3 @@
+32e7bd2fdb04d0b05462b24d42409ec7  live.2008.07.25.tar.gz
+4bf8822d97282bd99a8b1cde8e6da84e  changelog.txt
+09a40aa249d1598923a68b35d6fcb5ea  liblivemedia_2007.02.20-2.diff.gz