rpms/HelixPlayer/devel HelixPlayer-1.0.3-disable-asm.patch, NONE, 1.1 HelixPlayer-1.0.5-missing-header.patch, NONE, 1.1 HelixPlayer-1.0.beta20040615-cvs-no-update.patch, NONE, 1.1 HelixPlayer-buildrc, NONE, 1.1 HelixPlayer.spec, NONE, 1.1 hxplay-1.0.4-nptl.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Aurelien Bompard (abompard) fedora-extras-commits at redhat.com
Fri Sep 29 13:28:09 UTC 2006


Author: abompard

Update of /cvs/extras/rpms/HelixPlayer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14821/devel

Modified Files:
	.cvsignore sources 
Added Files:
	HelixPlayer-1.0.3-disable-asm.patch 
	HelixPlayer-1.0.5-missing-header.patch 
	HelixPlayer-1.0.beta20040615-cvs-no-update.patch 
	HelixPlayer-buildrc HelixPlayer.spec hxplay-1.0.4-nptl.patch 
Log Message:
auto-import HelixPlayer-1.0.7-4 on branch devel from HelixPlayer-1.0.7-4.src.rpm

HelixPlayer-1.0.3-disable-asm.patch:

--- NEW FILE HelixPlayer-1.0.3-disable-asm.patch ---
--- hxplay-1.0.3/audio/fixptutil/pub/math64.h.disable-asm	2004-09-17 14:22:38.000000000 -0400
+++ hxplay-1.0.3/audio/fixptutil/pub/math64.h	2005-03-03 14:56:56.000000000 -0500
@@ -124,7 +124,7 @@
 // GCC / i386
 ///////////////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUC__) && defined(__i386__) && !defined(_NO_GNU_AS)
+#if defined(__GNUC__) && defined(__i386__) && !defined(_NO_GNU_AS) && 0
 
 #define HAVE_PLATFORM_MACROS
 
@@ -250,7 +250,7 @@
 #endif
 #endif // defined(__sparc)
 
-#if (defined(__SVR4) && defined(__i386) && (defined(_NO_GNU_AS) || !defined(__GNUC__)) )
+#if (defined(__SVR4) && defined(__i386) && (defined(_NO_GNU_AS) || !defined(__GNUC__))  || 1)
 /* No 64bit, no asm provided in some other file..
  * need normal funcs for sun forte CC + 386 
  * However... forte's inline assembly for MulShift32 is just as good
@@ -414,7 +414,7 @@
 // GCC / PowerPC
 ///////////////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUC__) && (defined(__POWERPC__) || defined(__powerpc__))
+#if defined(__GNUC__) && (defined(__POWERPC__) || defined(__powerpc__) && 0)
 
 /*if your compiler can compile 64-bit instructions, and your CPU has them,
  define this. */

HelixPlayer-1.0.5-missing-header.patch:

--- NEW FILE HelixPlayer-1.0.5-missing-header.patch ---
--- hxplay-1.0.5/player/hxclientkit/src/CHXClientSiteSupplier.h.missing-header	2005-06-10 15:25:14.000000000 -0400
+++ hxplay-1.0.5/player/hxclientkit/src/CHXClientSiteSupplier.h	2005-06-10 15:25:45.000000000 -0400
@@ -62,6 +62,7 @@
 #include "exit_hx_headers.h"
 
 #include "HXClientCallbacks.h"
+#include "CHXClientSite.h"
 
 class CHXFlatArray;
 _INTERFACE IHXPlayer;

HelixPlayer-1.0.beta20040615-cvs-no-update.patch:

--- NEW FILE HelixPlayer-1.0.beta20040615-cvs-no-update.patch ---
--- HelixPlayer-1.0.beta20040615/build/lib/cvs.py~	2004-05-11 16:55:26.000000000 -0400
+++ HelixPlayer-1.0.beta20040615/build/lib/cvs.py	2004-07-13 12:00:31.301744656 -0400
@@ -594,6 +594,7 @@
              timestamp = None,
              nonrecursive = 0,
              zap = None):
+    return
 
     module_list = listify(module_list)
 
@@ -617,12 +618,15 @@
 
 
 def Status(repository, path, dir = None):
+    return
     return Get(repository).Status(path, dir)
 
 def Commit(repository, path, message, dir = None):
+    return
     return Get(repository).Commit(path, message, dir)
 
 def Tag(repository, path, tag, dir=None):
+    return
     return Get(repository).Tag(path, tag, dir)
 
 def MagicFixDir(dir = "."):


--- NEW FILE HelixPlayer-buildrc ---
SetSDKPath("oggvorbissdk", "/usr")


--- NEW FILE HelixPlayer.spec ---
Summary:	Open source media player based on the Helix framework
Name:		HelixPlayer
Version:	1.0.7
Epoch:		1
Release:	4%{?dist}
Group:		Applications/Multimedia
License:	RPSL, GPL
URL:		https://player.helixcommunity.org/
Source0:	https://helixcommunity.org/download.php/1950/hxplay-1.0.7-source.tar.bz2
Source1:	HelixPlayer-buildrc

Obsoletes:	G2player, RealOne
Provides:	G2player, RealOne

Patch0:		%{name}-1.0.beta20040615-cvs-no-update.patch
Patch1:		%{name}-1.0.3-disable-asm.patch
Patch2:		hxplay-1.0.4-nptl.patch
Patch3:		%{name}-1.0.5-missing-header.patch

BuildRequires:	libtheora-devel >= 1.0alpha3-3
BuildRequires:	libvorbis-devel
BuildRequires:	gtk2-devel, python, prelink
BuildRequires:	libogg-devel
BuildRequires:	desktop-file-utils
%if "%{?fedora}" > "4" || "%{?rhel}" > "4" || "%{?fedora}%{?rhel}" == ""
BuildRequires:  libXt-devel libXv-devel
%else
BuildRequires:  xorg-x11-devel
%endif

ExcludeArch:	ppc64 x86_64 s390 s390x ia64
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Helix Player is an open-source media player built in the Helix 
Community for consumers. Built using GTK, it plays open source formats, 
like Ogg Vorbis and Theora using the powerful Helix DNA Client Media 
Engine.

%package plugin
Summary:    HelixPlayer's webbrowser plugin
Group:      Applications/Multimedia
Requires:   %{name} = %{epoch}:%{version}-%{release}
Requires:   %{_libdir}/mozilla/plugins

%description plugin
This plugin lets your webbrowser play multimedia content through
HelixPlayer


%prep
%setup -q -n hxplay-%{version}
%patch0 -p1 -b cvs-no-update
%patch1 -p1 -b .disable-asm
%patch2 -p1 -b .nptl
%patch3 -p1 -b .missing-header

%build
# Change hxplay_gtk_release to whatever string is in the Makefile
BUILDRC=%{SOURCE1} BUILD_ROOT="`pwd`/build" \
	PATH="$PATH:$$BUILD_ROOT/bin" \
	python build/bin/build -v -t release -k -y \
	%{?_smp_mflags} -m hxplay_gtk_release \
	-p green -P helix-client-all-defines-free \
	player_all 

chmod -x build/*.txt

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{_bindir}

cat > %{buildroot}/%{_bindir}/hxplay <<EOF
#!/bin/sh
HELIX_LIBS=%{_libdir}/helix
export HELIX_LIBS
exec %{_bindir}/hxplay.bin "\$@"
EOF

install -p -m 755 release/hxplay.bin %{buildroot}/%{_bindir}/
chmod a+x %{buildroot}/%{_bindir}/*

mkdir -p %{buildroot}/%{_libdir}/helix/common
install -p -m 755 player/installer/archive/temp/common/*.so %{buildroot}/%{_libdir}/helix/common/
mkdir -p %{buildroot}/%{_libdir}/helix/plugins
install -p -m 755 player/installer/archive/temp/plugins/*.so %{buildroot}/%{_libdir}/helix/plugins/

mkdir -p %{buildroot}/%{_libdir}/helix
install -p -m 644 player/installer/archive/temp/LICENSE %{buildroot}/%{_libdir}/helix/
install -p -m 644 player/installer/archive/temp/README %{buildroot}/%{_libdir}/helix/
(cd %{buildroot}/%{_docdir}/%{name}-%{version} && ln -s %{_libdir/helix} .)

mkdir -p %{buildroot}/%{_libdir}/helix/codecs
install -p -m 755 player/installer/archive/temp/codecs/*.so %{buildroot}/%{_libdir}/helix/codecs/
mkdir -p %{buildroot}/%{_libdir}/mozilla/plugins
install -p -m 755 player/installer/archive/temp/mozilla/nphelix.so %{buildroot}/%{_libdir}/mozilla/plugins/
install -p -m 644 player/installer/archive/temp/mozilla/nphelix.xpt %{buildroot}/%{_libdir}/mozilla/plugins
mkdir -p %{buildroot}/%{_datadir}/application-registry/
install -p -m 644 player/installer/common/hxplay.applications %{buildroot}/%{_datadir}/application-registry/
# Desktop file
mkdir -p %{buildroot}/%{_datadir}/applications/
cp -p player/installer/common/hxplay.desktop player/installer/common/realplay.desktop
desktop-file-install  --vendor fedora \
        --dir %{buildroot}%{_datadir}/applications \
        --add-category X-Fedora \
        player/installer/common/realplay.desktop

mkdir -p %{buildroot}/%{_datadir}/mime-info/
install -p -m 644 player/installer/common/hxplay.keys %{buildroot}/%{_datadir}/mime-info/
install -p -m 644 player/installer/common/hxplay.mime %{buildroot}/%{_datadir}/mime-info/

mkdir -p %{buildroot}/%{_libdir}/helix/share/hxplay
(cd %{buildroot}/%{_libdir}/helix/share/ && ln -s %{_datadir}/icons/hicolor/48x48/apps/hxplay.png .)
install -p -m 644 player/app/gtk/res/default/*.png %{buildroot}/%{_libdir}/helix/share/hxplay/
install -p -m 644 player/app/gtk/res/hxplay/*.png %{buildroot}/%{_libdir}/helix/share/hxplay/

for LANGUAGE in "de" "es" "fr" "it" "ja" "ko" "pt_BR" "zh_CN" "zh_TW"; do
	dir=%{buildroot}/%{_datadir}/locale/$LANGUAGE/LC_MESSAGES/
	mkdir -p $dir
	install -p -m 644 "player/installer/archive/temp/share/locale/$LANGUAGE/player.mo" "$dir/hxplay.mo"
	install -p -m 644 "player/installer/archive/temp/share/locale/$LANGUAGE/widget.mo" "$dir/libgtkhx.mo"
done

for SIZE in "16x16" "32x32" "48x48" "128x128" "192x192" ; do
	mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/$SIZE
	mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/$SIZE/apps
	mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/$SIZE/mimetypes

	ICON=player/app/gtk/res/icons/hxplay/hxplay_${SIZE}.png
	if [ -f "$ICON" ] ; then
		mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/${SIZE}/apps
		install -p -m 644 "$ICON" %{buildroot}/%{_datadir}/icons/hicolor/${SIZE}/apps/hxplay.png
	fi

	for MIME in \
		"application-ram"     \
		"application-rpm"     \
		"application-rm"      \
		"audio-ra"            \
		"video-rv" ; do

		ICON=player/app/gtk/res/icons/hxplay/mime-${MIME}_${SIZE}.png
		if [ -f "$ICON" ] ; then
			mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/${SIZE}/mimetypes
			install -p -m 644 "$ICON" %{buildroot}/%{_datadir}/icons/hicolor/${SIZE}/mimetypes/hxplay-${MIME}.png
		fi
	done
done

# Hack to get rid of executable stack on shared object files
execstack -c %{buildroot}/%{_libdir}/helix/codecs/colorcvt.so
execstack -c %{buildroot}/%{_libdir}/helix/codecs/cvt1.so
execstack -c %{buildroot}/%{_libdir}/helix/plugins/vidsite.so


chmod -x %{buildroot}/%{_datadir}/application-registry/hxplay.applications
chmod -x %{buildroot}/%{_datadir}/mime-info/hxplay.mime
chmod -x %{buildroot}/%{_libdir}/helix/LICENSE
chmod -x %{buildroot}/%{_datadir}/mime-info/hxplay.keys

%{find_lang} hxplay
%{find_lang} libgtkhx
cat hxplay.lang > %{name}.lang
cat libgtkhx.lang >> %{name}.lang

%clean
rm -rf %{buildroot}

%post
update-desktop-database %{_datadir}/applications
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%postun
update-desktop-database %{_datadir}/applications
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :

%files -f %{name}.lang
%defattr(-,root,root)
%doc build/*.txt
%{_bindir}/hxplay*
%{_libdir}/helix
%{_datadir}/icons/hicolor/*
%{_datadir}/mime-info/*
%{_datadir}/applications/*.desktop
%{_datadir}/application-registry/hxplay.applications

%files plugin
%defattr(-,root,root)
%{_libdir}/mozilla/plugins/*


%changelog
* Thu Sep 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 1:1.0.7-4
- fixes from bug 201006 comment 20

* Thu Sep 28 2006 Aurelien Bompard <abompard at fedoraproject.org> 1:1.0.7-3
- split the webbrowser plugin

* Tue Sep 19 2006 Aurelien Bompard <abompard at fedoraproject.org> 1:1.0.7-2
- added fixes from bug 201006 comment 2

* Wed Aug 02 2006 Michael J. Knox <michael[AT]knox.net.nz> - 1:1.0.7-1
- FE import from FC
- version bump
- spec tidy

* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0.6-3.1
- rebuild

* Tue Jun 06 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0.6-3
- Added missing BR libXt-devel, libXv-devel

* Mon Feb 13 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0.6-1.2.2
- rebump for build order issues during double-long bump

* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0.6-1.2.1
- bump again for double-long bug on ppc(64)

* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.0.6-1.2
- rebuilt for new gcc4.1 snapshot and glibc changes

* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - 1:1.0.6-1
- rebuilt

* Tue Sep 27 2005 John (J5) Palmieri <johnp at redhat.com> - 1:1.0.6-1
- Fix for CAN-2005-2710

* Tue Aug 18 2005 John (J5) Palmieri <johnp at redhat.com> - 1:1.0.5-2
- Bump and rebuild for cairo ABI change

* Fri Jun 24 2005 Colin Walters <walters at redhat.com> 1:1.0.5-1
- Update to 1.0.5
- Remove some hardcoded 1.0.4 in specfile in favor of version var
- New patch HelixPlayer-1.0.5-missing-header.patch

* Tue May 03 2005 John (J5) Palmieri <johnp at redhat.com> 1:1.0.4-4
- remove compat-gcc32 requirement

* Tue Apr 26 2005 John (J5) Palmieri <johnp at redhat.com> 1:1.0.4-3
- add nptl patch to fix compile with nptl

* Tue Apr 19 2005 John (J5) Palmieri <johnp at redhat.com> 1:1.0.4-2
- Update to upstream version 1.0.4 to fix 155386

* Thu Mar 3 2005 Ray Strode <rstrode at redhat.com> 1:1.0.3-4
- Update to 1.0.3 to fix 150098 and 150103.
- Add some execshield foo to stop some execstack regressions
- Add libogg-devel build req to tame compiler
- Use compat-gcc because gcc 4.0 is being difficult

* Wed Jan 24 2005 Colin Walters <walters at redhat.com> 1:1.0.2-3
- Remove EULA from License field (there is no EULA AFAICS), and
  add GPL

* Wed Jan 05 2005 Colin Walters <walters at redhat.com> 1:1.0.2-2
- Apply patch from ville.skytta at iki.fi to avoid
  owning /usr/lib/mozilla (144237)

* Mon Jan 03 2005 Colin Walters <walters at redhat.com> 1:1.0.2-1
- New upstream version 1.0.2
- Switch to hxplay_gtk_stable branch

* Fri Oct 15 2004 Colin Walters <walters at redhat.com> 1:1.0.1.gold-6
- Require libbluecurve.so to fix 135709, since it apparently
  cannot be done in comps at this point.

* Fri Oct 15 2004 Colin Walters <walters at redhat.com> 1:1.0.1.gold-5
- Ok, we can not Requires: redhat-artwork.i386.  Reassigning
  135709 to comps.

* Thu Oct 14 2004 Colin Walters <walters at redhat.com> 1:1.0.1.gold-4
- Pull in 32-bit redhat-artwork on x86_64 (135709)
- Rename hxplay.desktop to realplay.desktop, in order to set 
  default mime handlers for realplay.desktop, until we get
  multiple application support in defaults.list (135705)

* Wed Oct 13 2004 Colin Walters <walters at redhat.com> 1:1.0.1.gold-3
- Install translations (bug 132336)

* Thu Oct 07 2004 Colin Walters <walters at redhat.com> 1:1.0.1.gold-2
- Fix wrapper script to handle commandline arguments

* Sun Oct 03 2004 Colin Walters <walters at redhat.com> 1:1.0.1.gold-1
- Update to 1.0.1
- Add epoch since 1.0.1.gold is older than 1.0.gold
- Drop upstreamed HelixPlayer-1.0.beta20040615-mmx-clobber.patch
- Drop HelixPlayer-1.0.beta20040615-desktop.patch per request
- Drop upstreamed HelixPlayer-1.0-filechooser.patch
- Drop upstreamed HelixPlayer-1.0-clobberedx.patch
- Switch to bingo-gold target

* Thu Sep 30 2004 Christopher Aillon <caillon at redhat.com> 1.0.gold-6
- PreReq desktop-file-utils >= 0.9

* Tue Sep 21 2004 David Woodhouse <dwmw2 at redhat.com> 1.0.gold-5
- Build on PPC

* Tue Sep 14 2004 Colin Walters <walters at redhat.com> 1.0.gold-4
- Add patch from Real to fix math64.h compilation
- Invoke update-desktop-database in post and postun, in
  preparation for fixing .desktop file for mime system
- Address some issues from #130744, thanks Ling Li:
  - Do release build
  - Install release binary
  - Fix typo in png installation
- Remove hack for installing debug ogg format

* Mon Aug 23 2004 Colin Walters <walters at redhat.com> 1.0.gold-3
- Install README and LICENSE

* Fri Aug 06 2004 Colin Walters <walters at redhat.com> 1.0.gold-2
- Put mozilla plugins in correct directory (#129305)

* Mon Aug 02 2004 Colin Walters <walters at redhat.com> 1.0.gold-1
- Update to gold
- Use setup -n to set directory instead of repacking tarball
- Switch bif target to bingo-gold-free

* Thu Jul 29 2004 Colin Walters <walters at redhat.com> 1.0.beta20040615-6
- Rework Summary a bit
- Minor spec cleanups

* Mon Jul 26 2004 Colin Walters <walters at redhat.com> 1.0.beta20040615-5
- Add patch to port to GtkFileChooser
- ExcludeArch ppc

* Fri Jul 16 2004 Colin Walters <walters at redhat.com> 1.0.beta20040615-4
- Restore MIME icon installation into hicolor directory 

* Fri Jul 16 2004 Colin Walters <walters at redhat.com> 1.0.beta20040615-3
- Add patch to fix desktop file name
- Set build failure color to "green" to exit on any error
- Add smp_mflags variable for parallel building

* Thu Jul 15 2004 Colin Walters <walters at redhat.com> 1.0.beta20040615-2
- BR latest theora
- More spec file bits
- Install logo for real

* Mon Jul 12 2004 Colin Walters <walters at redhat.com> 1.0.beta20040615-1
- Some spec file cleanups

* Mon Jun 8 2004 Ryan Gammon <rgammon at real.com>
- Adding /usr/share/pixmap, document icons

* Mon Jun 7 2004 Nicholas Hart <nhart at real.com>
- added .mime/.keys/.applications files

* Wed May 5 2004 Ryan Gammon <rggammon at helixcommunity.org>
- Updating icons

* Thu Jan 13 2004  Nicholas Hart <nhart at helixcommunity.org>
- tweaked some paths to deal with tarball generated by player/installer/app
- changed, reformatted some of the package info

* Sat Dec 27 2003 Thomas Chung <tchung at linuxinstall.org> 0.2.0.0-20031224
- First RPM build for Fedora Core 1

hxplay-1.0.4-nptl.patch:

--- NEW FILE hxplay-1.0.4-nptl.patch ---
--- hxplay-1.0.4/common/system/pub/platform/unix/pthreadthreads.h.nptl	2005-04-26 16:06:25.664696000 -0400
+++ hxplay-1.0.4/common/system/pub/platform/unix/pthreadthreads.h	2005-04-26 16:06:49.408928000 -0400
@@ -102,10 +102,7 @@
 
 #ifndef _MAC_UNIX
 
-struct HXsem_t : public sem_t
-{
-    char padding[64]; /* Flawfinder: ignore */ // different linux versions have different binary reps blechhhh!
-};
+#define HXsem_t sem_t
 
 //=======================================================================
 //


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/HelixPlayer/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Sep 2006 13:18:32 -0000	1.1
+++ .cvsignore	29 Sep 2006 13:28:09 -0000	1.2
@@ -0,0 +1 @@
+hxplay-1.0.7-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/HelixPlayer/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Sep 2006 13:18:32 -0000	1.1
+++ sources	29 Sep 2006 13:28:09 -0000	1.2
@@ -0,0 +1 @@
+d461d9983a98e8baf2893ac635512519  hxplay-1.0.7-source.tar.bz2




More information about the scm-commits mailing list