[crystalhd-kmod] Initial import for crystalhd-kmod
by Nicolas Chauvet
commit 90fdf7b3f80fb45408af2cacc03ddee14d65d8e3
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Feb 27 21:37:43 2018 +0100
Initial import for crystalhd-kmod
.gitignore | 1 +
crystalhd-Kconfig | 6 ++
crystalhd-Makefile | 21 +++++++
crystalhd-kmod.spec | 94 +++++++++++++++++++++++++++++
crystalhd-kmodtool-excludekernel-filterfile | 0
sources | 1 +
6 files changed, 123 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..8dcb533 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/crystalhd-kmod-*.tar.xz
diff --git a/crystalhd-Kconfig b/crystalhd-Kconfig
new file mode 100644
index 0000000..507f48b
--- /dev/null
+++ b/crystalhd-Kconfig
@@ -0,0 +1,6 @@
+config CRYSTALHD
+ tristate "Broadcom Crystal HD video decoder support"
+ depends on PCI
+ default n
+ help
+ Support for the Broadcom Crystal HD video decoder chipset
diff --git a/crystalhd-Makefile b/crystalhd-Makefile
new file mode 100644
index 0000000..4394411
--- /dev/null
+++ b/crystalhd-Makefile
@@ -0,0 +1,21 @@
+
+INCLUDES = -I$(KDIR)/include
+INCLUDES += -I$(src)/../../include
+INCLUDES += -I$(src)/../../include/link
+INCLUDES += -I$(src)/../../include/flea
+
+EXTRA_CFLAGS = -D__KERNEL__ -DMODULE $(INCLUDES) $(INC)
+EXTRA_CFLAGS += -Wall -Wstrict-prototypes -Wno-trigraphs -Werror -O2
+
+OBJ := crystalhd_lnx.o \
+ crystalhd_misc.o \
+ crystalhd_cmds.o \
+ crystalhd_hw.o \
+ crystalhd_linkfuncs.o \
+ crystalhd_fleafuncs.o \
+ crystalhd_flea_ddr.o
+
+PWD = $(shell pwd)
+
+obj-$(CONFIG_CRYSTALHD) := crystalhd.o
+ crystalhd-objs := $(OBJ)
diff --git a/crystalhd-kmod.spec b/crystalhd-kmod.spec
new file mode 100644
index 0000000..1f544e9
--- /dev/null
+++ b/crystalhd-kmod.spec
@@ -0,0 +1,94 @@
+%global buildforkernels akmod
+%global debug_package %{nil}
+
+Name: crystalhd-kmod
+Summary: Kernel module (kmod) for crystalhd
+Version: 20170515
+Release: 1%{?dist}
+License: GPLv2
+URL: https://github.com/philipl/crystalhd.git
+Source0: crystalhd-kmod-%{version}.tar.xz
+Source1: crystalhd-Makefile
+Source2: crystalhd-Kconfig
+Source11: crystalhd-kmodtool-excludekernel-filterfile
+# get the needed BuildRequires (in parts depending on what we build for)
+BuildRequires: %{_bindir}/kmodtool
+%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
+%{?fedora:BuildRequires: unifdef}
+ExclusiveArch: i686 x86_64
+
+
+# kmodtool does its magic here
+%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
+
+%description
+CrystalHD extra modules.
+
+%prep
+# error out if there was something wrong with kmodtool
+%{?kmodtool_check}
+# print kmodtool output for debugging purposes:
+kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
+
+%setup -q -c
+#Copied from kernel sources
+install -pm 0644 %{SOURCE1} drivers/staging/crystalhd/Makefile
+install -pm 0644 %{SOURCE2} drivers/staging/crystalhd/Kconfig
+for kernel_version in %{?kernel_versions} ; do
+ cp -a drivers/staging/crystalhd _kmod_build_${kernel_version%%___*}
+done
+
+
+%build
+for kernel_version in %{?kernel_versions} ; do
+%make_build -C ${kernel_version##*___} \
+ M=${PWD}/_kmod_build_${kernel_version%%___*} \
+ CONFIG_CRYSTALHD=m \
+ V=1\
+ modules
+done
+
+
+%install
+for kernel_version in %{?kernel_versions}; do
+ mkdir -p ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
+ install -D -m 755 -t ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ $(find _kmod_build_${kernel_version%%___*}/ -name '*.ko')
+ chmod u+x %{buildroot}%{_prefix}/lib/modules/*/extra/*/*
+done
+%{?akmod_install}
+
+
+%changelog
+* Wed May 17 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 20170515-1
+- Update to 20170515
+
+* Fri Feb 10 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 20170210-1
+- Update to 20170210
+
+* Sat Nov 14 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 20131018-4
+- Rebuilt for f23
+
+* Sun Mar 01 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 20131018-3.5
+- Rebuilt for kmod
+
+* Tue Jan 20 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 20131018-2.5
+- Rebuilt for kernel
+
+* Wed Mar 12 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 20131018-2.4
+- Rebuilt for kernel
+
+* Sat Mar 01 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 20131018-2.3
+- Rebuilt for kernel
+
+* Mon Feb 10 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 20131018-2.2
+- Rebuilt for kernel
+
+* Sun Jan 26 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 20131018-2.1
+- Rebuilt for kernel
+
+* Wed Jan 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 20131018-2
+- Disable ARM
+
+* Wed Jan 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 20130106-1
+- Initial spec file
+
diff --git a/crystalhd-kmodtool-excludekernel-filterfile b/crystalhd-kmodtool-excludekernel-filterfile
new file mode 100644
index 0000000..e69de29
diff --git a/sources b/sources
index e69de29..d0556ca 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+a8257a91cbed4e32bf909bd8fae313c1 crystalhd-kmod-20170515.tar.xz
6 years, 2 months
[x265] Fix build on arm
by Nicolas Chauvet
commit 00c7d180d2c1311b5940eb5b7e79c9151a4306b1
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Feb 27 21:14:43 2018 +0100
Fix build on arm
x265-arm-cflags.patch | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++
x265.spec | 6 +++++-
2 files changed, 65 insertions(+), 1 deletion(-)
---
diff --git a/x265-arm-cflags.patch b/x265-arm-cflags.patch
new file mode 100644
index 0000000..30d213a
--- /dev/null
+++ b/x265-arm-cflags.patch
@@ -0,0 +1,60 @@
+diff -up x265_2.7/source/CMakeLists.txt.cflags x265_2.7/source/CMakeLists.txt
+--- x265_2.7/source/CMakeLists.txt.cflags 2018-02-27 20:19:33.328932385 +0100
++++ x265_2.7/source/CMakeLists.txt 2018-02-27 20:29:14.808956583 +0100
+@@ -233,18 +233,6 @@ if(GCC)
+ endif()
+ endif()
+ endif()
+- if(ARM AND CROSS_COMPILE_ARM)
+- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
+- elseif(ARM)
+- find_package(Neon)
+- if(CPU_HAS_NEON)
+- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC)
+- add_definitions(-DHAVE_NEON)
+- else()
+- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
+- endif()
+- endif()
+- add_definitions(${ARM_ARGS})
+ if(FPROFILE_GENERATE)
+ if(INTEL_CXX)
+ add_definitions(-prof-gen -prof-dir="${CMAKE_CURRENT_BINARY_DIR}")
+@@ -517,7 +505,7 @@ if((MSVC_IDE OR XCODE OR GCC) AND ENABLE
+ add_custom_command(
+ OUTPUT ${ASM}.${SUFFIX}
+ COMMAND ${CMAKE_CXX_COMPILER}
+- ARGS ${ARM_ARGS} -c ${ASM_SRC} -o ${ASM}.${SUFFIX}
++ ARGS ${CFLAGS} -c ${ASM_SRC} -o ${ASM}.${SUFFIX}
+ DEPENDS ${ASM_SRC})
+ endforeach()
+ elseif(X86)
+diff -up x265_2.7/source/dynamicHDR10/CMakeLists.txt.cflags x265_2.7/source/dynamicHDR10/CMakeLists.txt
+--- x265_2.7/source/dynamicHDR10/CMakeLists.txt.cflags 2018-02-21 09:55:56.000000000 +0100
++++ x265_2.7/source/dynamicHDR10/CMakeLists.txt 2018-02-27 20:29:45.377062994 +0100
+@@ -42,18 +42,6 @@ if(GCC)
+ endif()
+ endif()
+ endif()
+- if(ARM AND CROSS_COMPILE_ARM)
+- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
+- elseif(ARM)
+- find_package(Neon)
+- if(CPU_HAS_NEON)
+- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC)
+- add_definitions(-DHAVE_NEON)
+- else()
+- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
+- endif()
+- endif()
+- add_definitions(${ARM_ARGS})
+ if(FPROFILE_GENERATE)
+ if(INTEL_CXX)
+ add_definitions(-prof-gen -prof-dir="${CMAKE_CURRENT_BINARY_DIR}")
+@@ -150,4 +138,4 @@ set(BIN_INSTALL_DIR bin CACHE STRING "In
+ option(ENABLE_SHARED "Build shared library" OFF)
+
+ install(FILES hdr10plus.h DESTINATION include)
+-endif()
+\ Pas de fin de ligne à la fin du fichier
++endif()
diff --git a/x265.spec b/x265.spec
index 4673eca..2f1a563 100644
--- a/x265.spec
+++ b/x265.spec
@@ -3,7 +3,7 @@
Summary: H.265/HEVC encoder
Name: x265
Version: 2.7
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://x265.org/
# source/Lib/TLibCommon - BSD
# source/Lib/TLibEncoder - BSD
@@ -16,6 +16,7 @@ Source0: https://bitbucket.org/multicoreware/%{name}/downloads/%{name}_%{vers
Patch0: x265-pic.patch
Patch1: x265-high-bit-depth-soname.patch
Patch2: x265-detect_cpu_armhfp.patch
+Patch3: x265-arm-cflags.patch
BuildRequires: cmake3
BuildRequires: nasm
@@ -135,6 +136,9 @@ done
%{_libdir}/pkgconfig/x265.pc
%changelog
+* Tue Feb 27 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 2.7-2
+- Fix CFLAGS on ARM
+
* Tue Feb 27 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.7-1
- update to 2.7
- Drop shared test patch as it causes nasm build to fail
6 years, 2 months
[x265] Revert "disable arm asm build till someone else can fix it properly"
by Nicolas Chauvet
commit ecc0e1cf46672da16ef9724c70193b607f590f9f
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Feb 27 20:18:42 2018 +0100
Revert "disable arm asm build till someone else can fix it properly"
This reverts commit 388ff9375cf5ae6cea15638032055c632e2dbbc1.
x265.spec | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/x265.spec b/x265.spec
index 84e6edd..4673eca 100644
--- a/x265.spec
+++ b/x265.spec
@@ -69,9 +69,6 @@ build() {
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON \
-DCMAKE_SKIP_RPATH:BOOL=YES \
-DENABLE_PIC:BOOL=ON \
-%ifarch armv7hnl
- -DENABLE_ASSEMBLY=OFF \
-%endif
-DENABLE_TESTS:BOOL=ON \
$* \
../source
@@ -139,7 +136,7 @@ done
%changelog
* Tue Feb 27 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.7-1
-- Update to 2.7
+- update to 2.7
- Drop shared test patch as it causes nasm build to fail
- Fix scriptlets
- Use ninja to build
6 years, 2 months
[vlc/f26] Add missing file
by Nicolas Chauvet
commit 924bd9a1dbda5e99df176323ac1dc1a05b962483
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Feb 27 19:47:31 2018 +0100
Add missing file
.gitignore | 1 +
sources | 1 +
vlc.spec | 4 ++++
3 files changed, 6 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index 6d32910..08ea01d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
vlc-*.tar.xz
+/asm.S
diff --git a/sources b/sources
index 69626ea..32b1dd7 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+09a713c9aba8dac5ccb5a982c62ed811 asm.S
32292f9fc6eab0b00432cdd574fc9eae vlc-3.0.1.tar.xz
diff --git a/vlc.spec b/vlc.spec
index dab8b27..529ee40 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -48,6 +48,8 @@ License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_rc:%{vlc_vers}/}vlc-%{vlc_vers}%{?vlc_tag}.tar.xz
+# Missing file from tarball
+Source1: asm.S
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
@@ -272,6 +274,8 @@ rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
./bootstrap
}
+install -pm 0644 %{SOURCE1} modules/arm_neon
+
%build
6 years, 2 months
[vlc/f27] Add missing file
by Nicolas Chauvet
Summary of changes:
32a338e... Add missing file (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 2 months
[vlc] Add missing file
by Nicolas Chauvet
commit 32a338eec2debaca9607505496edaf50d9118aeb
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Feb 27 19:47:31 2018 +0100
Add missing file
.gitignore | 1 +
sources | 1 +
vlc.spec | 4 ++++
3 files changed, 6 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index 6d32910..08ea01d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
vlc-*.tar.xz
+/asm.S
diff --git a/sources b/sources
index 69626ea..32b1dd7 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+09a713c9aba8dac5ccb5a982c62ed811 asm.S
32292f9fc6eab0b00432cdd574fc9eae vlc-3.0.1.tar.xz
diff --git a/vlc.spec b/vlc.spec
index 233572f..88f4275 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -48,6 +48,8 @@ License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_rc:%{vlc_vers}/}vlc-%{vlc_vers}%{?vlc_tag}.tar.xz
+# Missing file from tarball
+Source1: asm.S
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
@@ -270,6 +272,8 @@ rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
./bootstrap
}
+install -pm 0644 %{SOURCE1} modules/arm_neon
+
%build
6 years, 2 months
[amule] Fix FTBFS with crypto++ 6.0.0
by Sérgio M. Basto
commit 572fb1147c7c8f9416d0f5295ee4b9f9ed86a13e
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Feb 27 18:44:41 2018 +0000
Fix FTBFS with crypto++ 6.0.0
amule.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/amule.spec b/amule.spec
index 488a6c4..eebfe79 100644
--- a/amule.spec
+++ b/amule.spec
@@ -7,7 +7,7 @@
Name: amule
Version: 2.3.2
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: File sharing client compatible with eDonkey
License: GPLv2+
Source0: https://github.com/amule-project/amule/archive/%{version}/%{name}-%{versi...
@@ -143,6 +143,9 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/COPYING
%changelog
+* Tue Feb 27 2018 Sérgio Basto <sergio(a)serjux.com> - 2.3.2-10
+- Fix FTBFS with crypto++ 6.0.0
+
* Sun Feb 25 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.2-9
- Spec clean-up and rebuilt for cryptopp
6 years, 2 months
[x265] disable arm asm build till someone else can fix it properly
by Leigh Scott
commit 388ff9375cf5ae6cea15638032055c632e2dbbc1
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Feb 27 18:10:57 2018 +0000
disable arm asm build till someone else can fix it properly
x265.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/x265.spec b/x265.spec
index 4673eca..84e6edd 100644
--- a/x265.spec
+++ b/x265.spec
@@ -69,6 +69,9 @@ build() {
-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON \
-DCMAKE_SKIP_RPATH:BOOL=YES \
-DENABLE_PIC:BOOL=ON \
+%ifarch armv7hnl
+ -DENABLE_ASSEMBLY=OFF \
+%endif
-DENABLE_TESTS:BOOL=ON \
$* \
../source
@@ -136,7 +139,7 @@ done
%changelog
* Tue Feb 27 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2.7-1
-- update to 2.7
+- Update to 2.7
- Drop shared test patch as it causes nasm build to fail
- Fix scriptlets
- Use ninja to build
6 years, 2 months
