rpms/oxine Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/oxine
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/free/owners/tmpcvsb18884/rpms/oxine
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module oxine
--- NEW FILE Makefile ---
# Top level Makefile for module oxine
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
11 years, 1 month
rpms/oxine - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/oxine
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/free/owners/tmpcvsb18884/rpms/oxine
Log Message:
Directory /cvs/free/rpms/oxine added to the repository
11 years, 1 month
rpms/kaffeine/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/kaffeine/devel
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/free/owners/tmpcvsh18667/rpms/kaffeine/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module kaffeine
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: kaffeine
# $Id: Makefile,v 1.1 2013/10/17 07:13:48 kwizart Exp $
NAME := kaffeine
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
11 years, 1 month
rpms/kaffeine/devel - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/kaffeine/devel
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/free/owners/tmpcvsh18667/rpms/kaffeine/devel
Log Message:
Directory /cvs/free/rpms/kaffeine/devel added to the repository
11 years, 1 month
rpms/kaffeine Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/kaffeine
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/free/owners/tmpcvsh18667/rpms/kaffeine
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module kaffeine
--- NEW FILE Makefile ---
# Top level Makefile for module kaffeine
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
11 years, 1 month
rpms/kaffeine - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/kaffeine
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/free/owners/tmpcvsh18667/rpms/kaffeine
Log Message:
Directory /cvs/free/rpms/kaffeine added to the repository
11 years, 1 month
rpms/xbmc/devel xbmc-13.0-dvdread.patch, NONE, 1.1 xbmc-13.0-hdhomerun.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 sources, 1.22, 1.23 xbmc-generate-tarball-xz.sh, 1.20, 1.21 xbmc.spec, 1.65, 1.66 xbmc-12.0-pvraddons-with-dependencies.patch, 1.1, NONE xbmc-12.2-dvdread.patch, 1.2, NONE xbmc-12.2-hdhomerun.patch, 1.1, NONE xbmc-pvr-addons-generate-tarball-xz.sh, 1.4, NONE
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/xbmc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18226
Modified Files:
.cvsignore sources xbmc-generate-tarball-xz.sh xbmc.spec
Added Files:
xbmc-13.0-dvdread.patch xbmc-13.0-hdhomerun.patch
Removed Files:
xbmc-12.0-pvraddons-with-dependencies.patch
xbmc-12.2-dvdread.patch xbmc-12.2-hdhomerun.patch
xbmc-pvr-addons-generate-tarball-xz.sh
Log Message:
* Wed Oct 16 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 13.0-0.1.Gotham_alpha8
- Update to Gotham alpha 8
- Add -devel subpackage
- Drop bundled PVR addon (we'll package this separately)
xbmc-13.0-dvdread.patch:
bootstrap.mk | 5 -----
configure.in | 22 +---------------------
lib/libdvd/Makefile.in | 20 +++++++-------------
3 files changed, 8 insertions(+), 39 deletions(-)
--- NEW FILE xbmc-13.0-dvdread.patch ---
commit 56647b999a332d78d9cfc758e8333ecc5c32f735
Author: Ken Dreyer <ktdreyer(a)ktdreyer.com>
Date: Mon May 6 17:07:40 2013 -0600
Fedora: use external dvdread
Original patch by Alex Lancaster <alexlan[AT]fedoraproject org>
(cherry picked from commit 9f9845af842a376d5bdf70742785e7727695fd03)
diff --git a/bootstrap.mk b/bootstrap.mk
index 8bc4795..1fc31a4 100644
--- a/bootstrap.mk
+++ b/bootstrap.mk
@@ -8,7 +8,6 @@ ifneq ($(wildcard lib/libdvd/libdvdcss/configure.ac),)
BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdcss/configure.ac
DVD_CSS=lib/libdvd/libdvdcss/configure
endif
-BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdread/configure.ac
BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdnav/configure.ac
ifneq ($(wildcard pvr-addons/Makefile.am),)
@@ -18,10 +17,6 @@ endif
BOOTSTRAP_TARGETS=$(basename $(BOOTSTRAP_SUBDIRS))
all: $(BOOTSTRAP_TARGETS)
-#preserve order for libdvd. dvdcss (if present) -> dvdread -> dvdnav.
-lib/libdvd/libdvdread/configure: $(DVD_CSS)
-lib/libdvd/libdvdnav/configure: lib/libdvd/libdvdread/configure
-
%: %.ac
autoreconf -vif $(@D)
-@rm -rf $((a)D)/autom4te.cache
diff --git a/configure.in b/configure.in
index 50bdf83..6136ecd 100644
--- a/configure.in
+++ b/configure.in
@@ -2734,29 +2734,9 @@ XB_CONFIG_MODULE([lib/libdvd/libdvdcss], [
--with-pic
], [$SKIP_CONFIG_DVDCSS])
-XB_CONFIG_MODULE([lib/libdvd/libdvdread], [
- ./configure2 \
- --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../libdvdcss/src" \
- --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
- --host=$host_alias \
- --build=$build_alias \
- --target=$target_alias \
- --enable-static \
- --disable-shared \
- --disable-strip \
- --disable-opts \
- --cc="$CC" &&
- $MAKE dvdread-config &&
- mkdir -p `pwd`/../includes/dvdread
- cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
- cp `pwd`/../libdvdread/src/dvdread/*.h `pwd`/../includes/dvdread
-], [0])
-
XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [
./configure2 \
- --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes" \
- --extra-ldflags="-L`pwd`/../libdvdread/obj" \
- --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
+ --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -fPIC -DPIC" \
--prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
--host=$host_alias \
--build=$build_alias \
diff --git a/lib/libdvd/Makefile.in b/lib/libdvd/Makefile.in
index 69d2286..1f5eebb 100644
--- a/lib/libdvd/Makefile.in
+++ b/lib/libdvd/Makefile.in
@@ -5,8 +5,7 @@ CXX=@CXX@
SYSDIR=@abs_top_srcdir@/system/players/dvdplayer
SOS= libdvdnav-$(ARCH).so
-DIRS= libdvdread \
- libdvdnav
+DIRS= libdvdnav
WRAPPER=@abs_top_srcdir(a)/xbmc/cores/DllLoader/exports/wrapper.o
WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias
@@ -14,7 +13,7 @@ WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_al
ifeq ($(findstring osx,$(ARCH)),osx)
LDFLAGS +=-bundle -undefined dynamic_lookup -read_only_relocs suppress
else
-LDFLAGS += -shared -fPIC -rdynamic
+LDFLAGS += -shared -fPIC -rdynamic -ldvdread
endif
ifeq ($(ARCH), powerpc-osx)
@@ -35,8 +34,7 @@ SLIB=$(addprefix $(SYSDIR)/, $(SOS))
DISTCLEAN_FILES=includes/dvdread/*.h \
includes/dvdcss/*.h \
- libdvdnav/config.h \
- libdvdread/config.h
+ libdvdnav/config.h
.PHONY: $(DIRS) compile
@@ -48,9 +46,9 @@ $(SYSDIR)/libdvdcss-$(ARCH).so: $($(WRAPPER)) libdvdcss/src/.libs/libdvdcss.a
$(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
$(WRAPPER) libdvdcss/src/*.o $(BUNDLE1_O)
-$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
+$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
$(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
- $(WRAPPER) $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o $(BUNDLE1_O)
+ $(WRAPPER) $(DVDCSS_O) libdvdnav/obj/*.o $(BUNDLE1_O)
else
@@ -59,8 +57,8 @@ $(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a
libdvdcss/src/*.o -Wl,--unresolved-symbols=ignore-all -lm \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
-$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
- $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o -lm \
+$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a
+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o -lm \
-Wl,--unresolved-symbols=ignore-all \
`cat $(WRAPPER:.o=.def)` $(WRAPPER)
@@ -70,10 +68,6 @@ libdvdcss/src/.libs/libdvdcss.a: libdvdcss;
libdvdcss: compile
$(MAKE) -C $@
-libdvdread/obj/libdvdread.a: libdvdread;
-libdvdread: compile
- $(MAKE) -C $@
-
libdvdnav/obj/libdvdnav.a: libdvdnav;
libdvdnav: compile
$(MAKE) -C $@
xbmc-13.0-hdhomerun.patch:
Makefile.in | 5 --
configure.in | 1
xbmc/filesystem/DllHDHomeRun.h | 78 +++++++++++++++++++++++++++--------------
3 files changed, 53 insertions(+), 31 deletions(-)
--- NEW FILE xbmc-13.0-hdhomerun.patch ---
commit 1e9e793eb2ceb55dad238e4a361b1cd32d5b39eb
Author: Ken Dreyer <ktdreyer(a)ktdreyer.com>
Date: Fri Aug 24 19:34:47 2012 -0600
Fedora: use external hdhomerun
Original patch by Alex Lancaster <alexlan[AT]fedoraproject org>
(cherry picked from commit ef5c269992b32d67de7547e9f530b6c971381f45)
diff --git a/Makefile.in b/Makefile.in
index 3b21d50..323e1eb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -209,7 +209,6 @@ endif
LIB_DIRS=\
lib/cximage-6.0 \
lib/libexif \
- lib/libhdhomerun \
lib/cpluff \
lib/xbmc-dll-symbols
@@ -405,8 +404,6 @@ libexif: dllloader
$(MAKE) -C lib/libexif
cmyth: dllloader
$(MAKE) -C lib/cmyth
-libhdhomerun: dllloader
- $(MAKE) -C lib/libhdhomerun
papcodecs: dllloader dvdpcodecs
test -d system/players/paplayer || mkdir system/players/paplayer
$(MAKE) -C lib/xbadpcm
@@ -435,7 +432,7 @@ endif
codecs: papcodecs dvdpcodecs
-libs: libhdhomerun imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
+libs: imagelib libexif system/libcpluff-@ARCH@.so $(CMYTH)
externals: codecs libs visualizations screensavers libaddon pvraddons
diff --git a/configure.in b/configure.in
index 6136ecd..7f4dfe8 100644
--- a/configure.in
+++ b/configure.in
@@ -2436,7 +2436,6 @@ OUTPUT_FILES="Makefile \
lib/libexif/Makefile \
lib/libXDAAP/Makefile \
lib/cmyth/Makefile \
- lib/libhdhomerun/Makefile \
lib/libsquish/Makefile \
lib/cximage-6.0/Makefile \
lib/libUPnP/Makefile \
diff --git a/xbmc/filesystem/DllHDHomeRun.h b/xbmc/filesystem/DllHDHomeRun.h
index 150b00f..57936be 100644
--- a/xbmc/filesystem/DllHDHomeRun.h
+++ b/xbmc/filesystem/DllHDHomeRun.h
@@ -20,7 +20,7 @@
*/
#include "DynamicDll.h"
-#include "lib/libhdhomerun/hdhomerun.h"
+#include <hdhomerun/hdhomerun.h>
class DllHdHomeRunInterface
{
@@ -41,30 +41,56 @@ public:
class DllHdHomeRun : public DllDynamic, public DllHdHomeRunInterface
{
- DECLARE_DLL_WRAPPER(DllHdHomeRun, DLL_PATH_LIBHDHOMERUN)
- DEFINE_METHOD5(int, discover_find_devices_custom, (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5))
- DEFINE_METHOD2(struct hdhomerun_device_t*, device_create_from_str, (const char* p1, struct hdhomerun_debug_t *p2))
- DEFINE_METHOD1(void, device_destroy, (struct hdhomerun_device_t* p1))
- DEFINE_METHOD1(int, device_stream_start, (struct hdhomerun_device_t* p1))
- DEFINE_METHOD3(uint8_t*, device_stream_recv, (struct hdhomerun_device_t* p1, size_t p2, size_t* p3))
- DEFINE_METHOD1(void, device_stream_stop, (struct hdhomerun_device_t* p1))
- DEFINE_METHOD2(int, device_set_tuner_channel, (struct hdhomerun_device_t *p1, const char *p2))
- DEFINE_METHOD2(int, device_set_tuner_program, (struct hdhomerun_device_t *p1, const char *p2))
- DEFINE_METHOD2(int, device_set_tuner_from_str, (struct hdhomerun_device_t *p1, const char *p2))
- DEFINE_METHOD2(void, device_set_tuner, (struct hdhomerun_device_t *p1, unsigned int p2))
- DEFINE_METHOD3(int, device_get_tuner_status, (struct hdhomerun_device_t *p1, char **p2, struct hdhomerun_tuner_status_t *p3));
- BEGIN_METHOD_RESOLVE()
- RESOLVE_METHOD_RENAME(hdhomerun_discover_find_devices_custom, discover_find_devices_custom)
- RESOLVE_METHOD_RENAME(hdhomerun_device_create_from_str, device_create_from_str)
- RESOLVE_METHOD_RENAME(hdhomerun_device_destroy, device_destroy)
- RESOLVE_METHOD_RENAME(hdhomerun_device_stream_start, device_stream_start)
- RESOLVE_METHOD_RENAME(hdhomerun_device_stream_recv, device_stream_recv)
- RESOLVE_METHOD_RENAME(hdhomerun_device_stream_stop, device_stream_stop)
- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_channel, device_set_tuner_channel)
- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_program, device_set_tuner_program)
- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_from_str, device_set_tuner_from_str)
- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner, device_set_tuner)
- RESOLVE_METHOD_RENAME(hdhomerun_device_get_tuner_status, device_get_tuner_status)
- END_METHOD_RESOLVE()
+public:
+ virtual ~DllHdHomeRun () {};
+
+ virtual int discover_find_devices_custom (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5)
+ { return ::hdhomerun_discover_find_devices_custom (p1, p2, p3, p4, p5); }
+
+ virtual struct hdhomerun_device_t *device_create_from_str (const char* p1, struct hdhomerun_debug_t *p2)
+ { return ::hdhomerun_device_create_from_str (p1, p2); }
+
+ virtual void device_destroy (struct hdhomerun_device_t* p1)
+ { ::hdhomerun_device_destroy (p1); }
+
+ virtual int device_stream_start (struct hdhomerun_device_t* p1)
+ { return ::hdhomerun_device_stream_start (p1); }
+
+
+ virtual uint8_t *device_stream_recv (struct hdhomerun_device_t* p1, size_t p2, size_t* p3)
+ {
+ uint8_t *retval;
+
+ size_t tmp = *p3;
+ retval = ::hdhomerun_device_stream_recv (p1, p2, &tmp);
+ *p3 = tmp;
+
+ return retval;
+ }
+
+ virtual void device_stream_stop (struct hdhomerun_device_t* p1)
+ { ::hdhomerun_device_stream_stop (p1); }
+
+ virtual int device_set_tuner_channel (struct hdhomerun_device_t *p1, const char *p2)
+ { return ::hdhomerun_device_set_tuner_channel (p1, p2); }
+
+ virtual int device_set_tuner_program (struct hdhomerun_device_t *p1, const char *p2)
+ { return ::hdhomerun_device_set_tuner_program (p1, p2); }
+
+
+ virtual int device_set_tuner_from_str (struct hdhomerun_device_t *p1, const char *p2)
+ { return ::hdhomerun_device_set_tuner_from_str (p1, p2); }
+
+
+ virtual void device_set_tuner (struct hdhomerun_device_t *p1, unsigned int p2)
+ { ::hdhomerun_device_set_tuner (p1, p2); }
+
+ virtual int device_get_tuner_status (struct hdhomerun_device_t *p1, char **p2, struct hdhomerun_tuner_status_t *p3)
+ { return ::hdhomerun_device_get_tuner_status (p1, p2, p3); }
+
+ // DLL faking.
+ virtual bool ResolveExports() { return true; }
+ virtual bool Load() { return true; }
+ virtual void Unload() {}
};
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 7 May 2013 02:05:24 -0000 1.20
+++ .cvsignore 16 Oct 2013 20:46:31 -0000 1.21
@@ -1,2 +1 @@
-xbmc-12.2-patched.tar.xz
-xbmc-pvr-addons-590f862-patched.tar.xz
+xbmc-13.0-Gotham_alpha8-patched.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources 7 May 2013 02:05:24 -0000 1.22
+++ sources 16 Oct 2013 20:46:31 -0000 1.23
@@ -1,2 +1 @@
-c64af8503660aba9d025d6e12eaf2864 xbmc-12.2-patched.tar.xz
-1b1b6234d0167e1743991ce38c6f8bf7 xbmc-pvr-addons-590f862-patched.tar.xz
+2780495e5cad5fd2b77f12a0ec3a18f5 xbmc-13.0-Gotham_alpha8-patched.tar.xz
Index: xbmc-generate-tarball-xz.sh
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc-generate-tarball-xz.sh,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xbmc-generate-tarball-xz.sh 7 May 2013 02:05:24 -0000 1.20
+++ xbmc-generate-tarball-xz.sh 16 Oct 2013 20:46:31 -0000 1.21
@@ -1,13 +1,13 @@
#!/bin/sh
-MAJORVERSION=12
-MINORVERSION=2
-#PRERELEASE=Frodo_rc3
+MAJORVERSION=13
+MINORVERSION=0
+PRERELEASE=Gotham_alpha8
VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}}
-GITHUBURL=https://github.com/xbmc/xbmc/zipball/$VERSION-Frodo
-#GITHUBURL=https://github.com/xbmc/xbmc/zipball/$PRERELEASE
+#GITHUBURL=https://github.com/xbmc/xbmc/zipball/$VERSION-Frodo
+GITHUBURL=https://github.com/xbmc/xbmc/zipball/$PRERELEASE
# download zipball
if [[ ! -f xbmc-$VERSION.zip ]]; then
@@ -27,7 +27,7 @@
# grrr, *still* have to keep in ffmpeg for now (2011-12-28) since upstream
# seems to require files within that subdirectory <sigh>, filed
# http://trac.xbmc.org/ticket/12370
-for i in cximage-6.0/zlib libid3tag/zlib libhdhomerun libmpeg2 ffmpeg
+for i in cximage-6.0/zlib libhdhomerun libmpeg2 ffmpeg
do
rm -r lib/$i
done
@@ -40,26 +40,26 @@
# remove DVD stuff we can't ship, or is already in external libraries
-for i in libdvdcss libdvdread includes
+for i in libdvdcss libdvdread includes
do
rm -r lib/libdvd/$i
done
-# remove all prebuilt binaries (e.g., .so files and Win32 DLLs)
-find \( -type f -name '*.so' -o -name '*.DLL' -o -name '*.dll' -o -name '*.lib' -o -name '*.zlib' -o -name '*.obj' -o -name '*.exe' -o -name '*.vis' \) -print0 | xargs -0 rm -f
+# remove all prebuilt binaries (e.g., Win32 DLLs)
+find \( -type f -name '*.DLL' -o -name '*.dll' -o -name '*.lib' -o -name '*.obj' -o -name '*.exe' \) -print0 | xargs -0 rm -f
# remove all other packages that should be system-wide
-# except for libass, cpluff, jsoncpp (need to figure out how to
+# except for libass, cpluff (need to figure out how to
# remove these too)
# xbmc-dll-symbols seems to be XBMC-specific
-for i in enca freetype libbluray liblame libmicrohttpd libmodplug librtmp win32
+for i in enca freetype libbluray libmicrohttpd libmodplug librtmp win32
do
rm -r lib/$i
done
-# TODO/FIXME: remove tools/XBMCLive/ and other things under tools/
+# TODO/FIXME: remove other unnecessary things under tools/
# also remove anything to do with win32
-for i in arm darwin win32buildtools
+for i in android darwin win32buildtools
do
rm -r tools/$i
done
Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- xbmc.spec 2 Oct 2013 08:14:21 -0000 1.65
+++ xbmc.spec 16 Oct 2013 20:46:31 -0000 1.66
@@ -1,41 +1,29 @@
-#global PRERELEASE Frodo_rc3
-%global DIRVERSION %{version}
+%global PRERELEASE Gotham_alpha8
+#%%global DIRVERSION %{version}
# use the line below for pre-releases
-#global DIRVERSION %{version}-%{PRERELEASE}
+%global DIRVERSION %{version}-%{PRERELEASE}
+%global _hardened_build 1
Name: xbmc
-Version: 12.2
-Release: 5%{?dist}
+Version: 13.0
+Release: 0.1.Gotham_alpha8%{?dist}
URL: http://www.xbmc.org/
Source0: %{name}-%{DIRVERSION}-patched.tar.xz
# xbmc contains code that we cannot ship, as well as redundant private
# copies of upstream libraries that we already distribute. Therefore
# we use this script to remove the code before shipping it.
-# Download the upstream tarball from:
-# http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-# and invoke this script while in the directory where the tarball is located:
-# ./xbmc-generate-tarball-xz.sh <version>
-# where <version> is the particular version being used
+# Invoke this script while in the directory where the tarball is located:
+# ./xbmc-generate-tarball-xz.sh
Source1: xbmc-generate-tarball-xz.sh
-# xbmc pvr addons are shipped as a separate git repo.
-Source2: xbmc-pvr-addons-590f862-patched.tar.xz
-Source3: xbmc-pvr-addons-generate-tarball-xz.sh
-
-# https://github.com/xbmc/xbmc/pull/1725.patch
-# We need this as long as we build addons together with the main XBMC
-# software. (This will probably never get merged upstream; see pull
-# request for details.)
-Patch1: xbmc-12.0-pvraddons-with-dependencies.patch
-
# filed ticket, but patch still needs work
# http://trac.xbmc.org/ticket/9658
-Patch2: xbmc-12.2-dvdread.patch
+Patch1: xbmc-13.0-dvdread.patch
# need to file trac ticket, this patch just forces external hdhomerun
# functionality, needs to be able fallback internal version
-Patch3: xbmc-12.2-hdhomerun.patch
+Patch2: xbmc-13.0-hdhomerun.patch
# Optional deps (not in EPEL)
@@ -171,6 +159,7 @@
# as they are dynamically loaded via XBMC's arcane
# pseudo-DLL loading scheme (sigh)
Requires: librtmp
+Requires: libmad
%if 0%{?_with_hdhomerun}
BuildRequires: hdhomerun
%endif
@@ -200,6 +189,17 @@
and featuring playlist, audio visualizations, slideshow, and weather
forecast functions, together third-party plugins.
+%package devel
+Summary: Development files needed to compile C programs against xbmc
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+
+XBMC media center is a free cross-platform media-player jukebox and
+entertainment hub. If you want to develop programs which use xbmc's
+libraries, you need to install this package.
+
#%%package eventclients
#%Summary: Media center event client remotes
@@ -217,11 +217,10 @@
%prep
-%setup -q -a 2 -n %{name}-%{DIRVERSION}
+%setup -q -n %{name}-%{DIRVERSION}
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%if 0%{?_with_hdhomerun}
%else
@@ -250,7 +249,6 @@
--enable-goom \
--enable-external-libraries \
--enable-pulse \
---enable-pvraddons-with-dependencies \
%if 0%{?_with_libcec}
--enable-libcec \
%endif
@@ -313,6 +311,9 @@
%{_datadir}/applications/xbmc.desktop
%{_datadir}/icons/hicolor/*/*/*.png
+%files devel
+%{_includedir}/xbmc
+
#%%files eventclients
#%%defattr(-,root,root)
#%%python_sitelib/xbmc
@@ -330,11 +331,16 @@
#%%{_includedir}/xbmc/xbmcclient.h
%changelog
-* Wed Oct 02 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 12.2-5
-- Rebuilt
+* Wed Oct 16 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 13.0-0.1.Gotham_alpha8
+- Update to Gotham alpha 8
+- Add -devel subpackage
+- Drop bundled PVR addon (we'll package this separately)
+
+* Thu Jul 04 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 12.2-5
+- Explicitly Require libmad (necessary for the upcoming xbmc 13)
-* Thu Aug 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 12.2-4
-- Rebuilt for FFmpeg 2.0.x
+* Wed Jun 05 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 12.2-4
+- Enable _hardened_build
* Tue Jun 04 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 12.2-3
- force building with libcec (#2798)
--- xbmc-12.0-pvraddons-with-dependencies.patch DELETED ---
--- xbmc-12.2-dvdread.patch DELETED ---
--- xbmc-12.2-hdhomerun.patch DELETED ---
--- xbmc-pvr-addons-generate-tarball-xz.sh DELETED ---
11 years, 1 month
rpms/ffmpeg/F-19 ffmpeg.spec,1.88,1.89
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/ffmpeg/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15927
Modified Files:
ffmpeg.spec
Log Message:
* Wed Oct 16 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.2.4-2
- Enabled avresample
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-19/ffmpeg.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- ffmpeg.spec 8 Oct 2013 18:34:19 -0000 1.88
+++ ffmpeg.spec 16 Oct 2013 20:19:41 -0000 1.89
@@ -17,7 +17,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 1.2.4
-Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
%else
@@ -145,6 +145,7 @@
--enable-libxvid \\\
--enable-x11grab \\\
--enable-avfilter \\\
+ --enable-avresample \\\
--enable-postproc \\\
--enable-pthreads \\\
--disable-static \\\
@@ -290,6 +291,9 @@
%changelog
+* Wed Oct 16 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.2.4-2
+- Enabled avresample
+
* Tue Oct 08 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.2.4-1
- Updated to 1.2.4
11 years, 1 month
rpms/perl-PGPLOT/EL-5 perl-PGPLOT.spec,1.1,1.2
by Sergio Pascual
Author: sergiopr
Update of /cvs/nonfree/rpms/perl-PGPLOT/EL-5
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1606
Modified Files:
perl-PGPLOT.spec
Log Message:
* Wed Oct 16 2013 Sergio Pascual <sergiopr(a)fis.ucm.es> - 2.21-2.1
- Add buildroot and defattr (old rpm)
Index: perl-PGPLOT.spec
===================================================================
RCS file: /cvs/nonfree/rpms/perl-PGPLOT/EL-5/perl-PGPLOT.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-PGPLOT.spec 16 Oct 2013 08:45:31 -0000 1.1
+++ perl-PGPLOT.spec 16 Oct 2013 09:42:07 -0000 1.2
@@ -1,14 +1,16 @@
Name: perl-PGPLOT
Version: 2.21
-Release: 2%{?dist}
+Release: 2%{?dist}.1
Summary: Perl extension for using the pgplot library
+Group: Development/Libraries
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/PGPLOT/
Source0: http://search.cpan.org/CPAN/authors/id/K/KG/KGB/PGPLOT-%{version}.tar.gz
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(ExtUtils::F77)
-BuildRequires: pgplot-devel
+BuildRequires: pgplot-devel
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%{?perl_default_filter}
@@ -19,29 +21,30 @@
%setup -q -n PGPLOT-%{version}
%build
-%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
make %{?_smp_mflags}
%install
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make pure_install PERL_INSTALL_ROOT=%{buildroot}
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
-find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
+find %{buildroot} -type f -name .packlist -exec rm -f {} \;
+find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \;
+find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
-%{_fixperms} $RPM_BUILD_ROOT/*
-
-#%check
-#works locally
-#make test
+%{_fixperms} %{buildroot}/*
%files
+%defattr(-,root,root,-)
%doc CHANGES HELP LICENSE README
%{perl_vendorarch}/*
%exclude %dir %{perl_vendorarch}/auto/
%{_mandir}/man3/*
%changelog
+* Wed Oct 16 2013 Sergio Pascual <sergiopr(a)fis.ucm.es> - 2.21-2.1
+- Add buildroot and defattr (old rpm)
+
* Wed Sep 11 2013 Sergio Pascual <sergiopr(a)fis.ucm.es> - 2.21-2
- Removed patch
- Added buildrequires perl(ExtUtils::F77)
11 years, 1 month
rpms/perl-PGPLOT/EL-5 perl-PGPLOT.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Sergio Pascual
Author: sergiopr
Update of /cvs/nonfree/rpms/perl-PGPLOT/EL-5
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30340/EL-5
Modified Files:
.cvsignore sources
Added Files:
perl-PGPLOT.spec
Log Message:
Import into EL-5
--- NEW FILE perl-PGPLOT.spec ---
Name: perl-PGPLOT
Version: 2.21
Release: 2%{?dist}
Summary: Perl extension for using the pgplot library
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/PGPLOT/
Source0: http://search.cpan.org/CPAN/authors/id/K/KG/KGB/PGPLOT-%{version}.tar.gz
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(ExtUtils::F77)
BuildRequires: pgplot-devel
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%{?perl_default_filter}
%description
Allow subroutines in the PGPLOT graphics library to be called from Perl.
%prep
%setup -q -n PGPLOT-%{version}
%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}
%install
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
%{_fixperms} $RPM_BUILD_ROOT/*
#%check
#works locally
#make test
%files
%doc CHANGES HELP LICENSE README
%{perl_vendorarch}/*
%exclude %dir %{perl_vendorarch}/auto/
%{_mandir}/man3/*
%changelog
* Wed Sep 11 2013 Sergio Pascual <sergiopr(a)fis.ucm.es> - 2.21-2
- Removed patch
- Added buildrequires perl(ExtUtils::F77)
* Tue Sep 10 2013 Sergio Pascual <sergiopr(a)fis.ucm.es> - 2.21-1
- Initial spec
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/perl-PGPLOT/EL-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 13 Sep 2013 19:17:10 -0000 1.1
+++ .cvsignore 16 Oct 2013 08:45:31 -0000 1.2
@@ -0,0 +1 @@
+PGPLOT-2.21.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/perl-PGPLOT/EL-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 13 Sep 2013 19:17:10 -0000 1.1
+++ sources 16 Oct 2013 08:45:31 -0000 1.2
@@ -0,0 +1 @@
+836d8eb09bfcadd5d4edf668a551f17a PGPLOT-2.21.tar.gz
11 years, 1 month