rpms/bino/F-16 bino-1.2.1-ld-fix.patch, NONE, 1.1 bino-1.2.1-unbundle-icons.patch, NONE, 1.1 bino.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Jaroslav Škarvada]

Author: jskarvad

Update of /cvs/free/rpms/bino/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1682/F-16

Modified Files:
	.cvsignore sources 
Added Files:
	bino-1.2.1-ld-fix.patch bino-1.2.1-unbundle-icons.patch 
	bino.spec 
Log Message:
Initial import


bino-1.2.1-ld-fix.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE bino-1.2.1-ld-fix.patch ---
diff -up bino-1.2.1/src/Makefile.in.orig bino-1.2.1/src/Makefile.in
--- bino-1.2.1/src/Makefile.in.orig	2011-10-10 21:18:59.000000000 +0200
+++ bino-1.2.1/src/Makefile.in	2011-11-09 19:54:08.419550089 +0100
@@ -445,7 +445,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/base $
 bino_LDADD = $(top_builddir)/src/base/libbase.a $(LIBINTL) $(LIBICONV) \
 	$(libavformat_LIBS) $(libavdevice_LIBS) $(libswscale_LIBS) \
 	$(libass_LIBS) $(libopenal_LIBS) $(libgl_LIBS) $(libglew_LIBS) \
-	$(libqtopengl_LIBS) $(am__append_3) $(am__append_6)
+	$(libqtopengl_LIBS) $(am__append_3) $(am__append_6) -lGLEW -lGLEWmx
 iconsdatadir = $(datadir)/icons/hicolor
 icons16dir = $(iconsdatadir)/16x16/apps
 icons32dir = $(iconsdatadir)/32x32/apps

bino-1.2.1-unbundle-icons.patch:
 Makefile.am |   32 ++++++++++++++++----------------
 Makefile.in |   32 ++++++++++++++++----------------
 2 files changed, 32 insertions(+), 32 deletions(-)

--- NEW FILE bino-1.2.1-unbundle-icons.patch ---
diff -up bino-1.2.1/src/Makefile.am.orig bino-1.2.1/src/Makefile.am
--- bino-1.2.1/src/Makefile.am.orig	2011-10-01 09:00:55.000000000 +0200
+++ bino-1.2.1/src/Makefile.am	2012-03-01 14:36:22.119185909 +0100
@@ -56,21 +56,21 @@ ICONS_LOCAL_IPE = \
 	icons-local/output-type-stereo.ipe
 
 ICONS = \
-	icons/application-exit.png \
-	icons/applications-internet.png \
-        icons/camera-web.png \
-	icons/document-open.png \
-	icons/help-about.png \
-	icons/help-contents.png \
-	icons/media-playback-pause.png \
-	icons/media-playback-start.png \
-	icons/media-playback-stop.png \
-	icons/media-playlist-repeat.png \
-	icons/media-seek-backward.png \
-	icons/media-seek-forward.png \
-	icons/preferences-desktop-keyboard.png \
-	icons/view-fullscreen.png \
-	icons/view-restore.png \
+	/usr/share/icons/oxygen/48x48/actions/application-exit.png \
+	/usr/share/icons/oxygen/48x48/categories/applications-internet.png \
+	/usr/share/icons/oxygen/48x48/devices/camera-web.png \
+	/usr/share/icons/oxygen/48x48/actions/document-open.png \
+	/usr/share/icons/oxygen/48x48/actions/help-about.png \
+	/usr/share/icons/oxygen/48x48/actions/help-contents.png \
+	/usr/share/icons/oxygen/48x48/actions/media-playback-pause.png \
+	/usr/share/icons/oxygen/48x48/actions/media-playback-start.png \
+	/usr/share/icons/oxygen/48x48/actions/media-playback-stop.png \
+	/usr/share/icons/oxygen/48x48/status/media-playlist-repeat.png \
+	/usr/share/icons/oxygen/48x48/actions/media-seek-backward.png \
+	/usr/share/icons/oxygen/48x48/actions/media-seek-forward.png \
+	/usr/share/icons/oxygen/48x48/apps/preferences-desktop-keyboard.png \
+	/usr/share/icons/oxygen/48x48/actions/view-fullscreen.png \
+	/usr/share/icons/oxygen/48x48/actions/view-restore.png \
 	$(patsubst %.ipe,%.png,$(ICONS_LOCAL_IPE))
 
 EXTRA_DIST = \
@@ -92,7 +92,7 @@ qt_resources.qrc:
 	echo '<file alias="LICENSE">$(top_srcdir)/COPYING</file>'; \
 	echo '<file alias="logo/bino_logo.png">$(top_srcdir)/src/logo/bino_logo.png</file>'; \
 	echo '<file alias="logo/64x64/bino.png">$(top_srcdir)/src/logo/64x64/bino.png</file>'; \
-	for icon in $(ICONS); do echo '<file alias="'"$${icon}"'">$(top_srcdir)/src/'"$${icon}"'</file>'; done; \
+	for icon in $(ICONS); do echo '<file alias="'"$${icon}"'">'"$${icon}"'</file>'; done; \
 	echo '</qresource>'; \
 	echo '</RCC>') > $@
 
diff -up bino-1.2.1/src/Makefile.in.orig bino-1.2.1/src/Makefile.in
--- bino-1.2.1/src/Makefile.in.orig	2011-10-10 21:18:59.000000000 +0200
+++ bino-1.2.1/src/Makefile.in	2012-03-01 14:36:35.726961839 +0100
@@ -399,21 +399,21 @@ ICONS_LOCAL_IPE = \
 	icons-local/output-type-stereo.ipe
 
 ICONS = \
-	icons/application-exit.png \
-	icons/applications-internet.png \
-        icons/camera-web.png \
-	icons/document-open.png \
-	icons/help-about.png \
-	icons/help-contents.png \
-	icons/media-playback-pause.png \
-	icons/media-playback-start.png \
-	icons/media-playback-stop.png \
-	icons/media-playlist-repeat.png \
-	icons/media-seek-backward.png \
-	icons/media-seek-forward.png \
-	icons/preferences-desktop-keyboard.png \
-	icons/view-fullscreen.png \
-	icons/view-restore.png \
+	/usr/share/icons/oxygen/48x48/actions/application-exit.png \
+	/usr/share/icons/oxygen/48x48/categories/applications-internet.png \
+	/usr/share/icons/oxygen/48x48/devices/camera-web.png \
+	/usr/share/icons/oxygen/48x48/actions/document-open.png \
+	/usr/share/icons/oxygen/48x48/actions/help-about.png \
+	/usr/share/icons/oxygen/48x48/actions/help-contents.png \
+	/usr/share/icons/oxygen/48x48/actions/media-playback-pause.png \
+	/usr/share/icons/oxygen/48x48/actions/media-playback-start.png \
+	/usr/share/icons/oxygen/48x48/actions/media-playback-stop.png \
+	/usr/share/icons/oxygen/48x48/status/media-playlist-repeat.png \
+	/usr/share/icons/oxygen/48x48/actions/media-seek-backward.png \
+	/usr/share/icons/oxygen/48x48/actions/media-seek-forward.png \
+	/usr/share/icons/oxygen/48x48/apps/preferences-desktop-keyboard.png \
+	/usr/share/icons/oxygen/48x48/actions/view-fullscreen.png \
+	/usr/share/icons/oxygen/48x48/actions/view-restore.png \
 	$(patsubst %.ipe,%.png,$(ICONS_LOCAL_IPE))
 
 EXTRA_DIST = \
@@ -1053,7 +1053,7 @@ qt_resources.qrc:
 	echo '<file alias="LICENSE">$(top_srcdir)/COPYING</file>'; \
 	echo '<file alias="logo/bino_logo.png">$(top_srcdir)/src/logo/bino_logo.png</file>'; \
 	echo '<file alias="logo/64x64/bino.png">$(top_srcdir)/src/logo/64x64/bino.png</file>'; \
-	for icon in $(ICONS); do echo '<file alias="'"$${icon}"'">$(top_srcdir)/src/'"$${icon}"'</file>'; done; \
+	for icon in $(ICONS); do echo '<file alias="'"$${icon}"'">'"$${icon}"'</file>'; done; \
 	echo '</qresource>'; \
 	echo '</RCC>') > $@
 


--- NEW FILE bino.spec ---
Name: bino
Version: 1.2.1
Release: 3%{?dist}
Summary: 3D video player
Group: System Environment/Base
License: GPLv3+
URL: http://bino3d.org
Source0: http://download.savannah.nongnu.org/releases-noredirect/bino/%{name}-%{version}.tar.xz
# Fix for implicit DSO linkage, patch accepted by upstream
Patch1: bino-1.2.1-ld-fix.patch
# Unbundle oxygen icons
Patch2: bino-1.2.1-unbundle-icons.patch
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
BuildRequires: ffmpeg-devel glew-devel libass-devel openal-devel qt-devel
BuildRequires: gettext texinfo oxygen-icon-theme

%description
Bino is a 3D video player. It supports stereoscopic 3D video with a wide
variety of input and output formats. It also supports multi-display video
and it can be used for powerwalls, virtual reality installations and other
multi-projector setups.

%prep
%setup -q

# Removal of unneeded stuff
rm -rf pkg/macosx/* pkg/w32
touch pkg/macosx/Info.plist.in

# Removal of bundled oxygen-icons
rm -rf src/icons

%patch1 -p1 -b .ld-fix
%patch2 -p1 -b .unbundle-icons

%build
%configure
make %{?_smp_mflags}

%install
make install DESTDIR=%{buildroot} mandir=%{_mandir}
rm -f %{buildroot}%{_infodir}/dir
mkdir _tmpdoc
mv %{buildroot}%{_datadir}/doc/%{name}/* _tmpdoc/
rm -rf %{buildroot}%{_datadir}/doc
%find_lang %{name}

%post
/sbin/install-info \
    --entry="* bino: (bino).   3D video player" \
    --section="Miscellaneous" \
    %{_infodir}/%{name}.info \
    %{_infodir}/dir 2>/dev/null || :

%preun
if [ $1 -eq 0 ]; then
  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
fi

%files -f %{name}.lang
%doc AUTHORS COPYING ChangeLog NEWS README _tmpdoc/*
%{_bindir}/bino
%{_infodir}/*
%{_mandir}/man1/*
%{_datadir}/applications/*
%{_datadir}/icons/hicolor/*/apps/*

%changelog
* Thu Mar  1 2012 Jaroslav Å karvada <jskarvad at redhat.com> - 1.2.1-3
- Unbundled oxygen icons

* Thu Mar 01 2012 Jaroslav Å karvada <jskarvad at redhat.com> - 1.2.1-2
- Used RPM macros instead of variables
- Added requires for post and preun sections
- Removed pkg dir in prep
- Added LGPLv3+ license to license tag (oxygen icons)

* Wed Nov 09 2011 Jaroslav Å karvada <jskarvad at redhat.com> - 1.2.1-1
- New version

* Tue Nov 01 2011 Jaroslav Å karvada <jskarvad at redhat.com> - 1.1.3-3
- Explicit link with glew, needed if compiled with Equalizer

* Wed Sep 14 2011 Jaroslav Å karvada <jskarvad at redhat.com> - 1.1.3-2
- Removed defattr
- Moved docs to one dir

* Sat Aug 20 2011 Jaroslav Å karvada <jskarvad at redhat.com> - 1.1.3-1
- Update to new version

* Sat Aug 20 2011 Jaroslav Å karvada <jskarvad at redhat.com> - 1.0.0-1
- Update to new version

* Sat Aug 20 2011 Jaroslav Å karvada <jskarvad at redhat.com> - 0.9.2-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/bino/F-16/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Mar 2012 17:31:54 -0000	1.1
+++ .cvsignore	12 Mar 2012 12:30:32 -0000	1.2
@@ -0,0 +1 @@
+bino-1.2.1.tar.xz


Index: sources
===================================================================
RCS file: /cvs/free/rpms/bino/F-16/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Mar 2012 17:31:54 -0000	1.1
+++ sources	12 Mar 2012 12:30:32 -0000	1.2
@@ -0,0 +1 @@
+8110094f05c02667760eda720f84618f  bino-1.2.1.tar.xz