rpms/mame/devel mame-genie-smpfix.patch, NONE, 1.1 mame.spec, 1.111, 1.112
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20771
Modified Files:
mame.spec
Added Files:
mame-genie-smpfix.patch
Log Message:
Fixed parallel building
mame-genie-smpfix.patch:
actions/make/make_cpp.lua | 2 +-
host/scripts.c | 24 ++++++++++++------------
2 files changed, 13 insertions(+), 13 deletions(-)
--- NEW FILE mame-genie-smpfix.patch ---
diff -up mame-0.163/3rdparty/genie/src/actions/make/make_cpp.lua.smpfix mame-0.163/3rdparty/genie/src/actions/make/make_cpp.lua
--- mame-0.163/3rdparty/genie/src/actions/make/make_cpp.lua.smpfix 2015-07-12 10:25:25.086599249 +0200
+++ mame-0.163/3rdparty/genie/src/actions/make/make_cpp.lua 2015-07-12 10:25:25.322601824 +0200
@@ -86,7 +86,7 @@
end
-- target build rule
- _p('$(TARGET): $(GCH) $(OBJECTS) $(LDDEPS) $(RESOURCES)')
+ _p('$(TARGET): $(TARGETDIR) $(OBJDIRS) $(GCH) $(OBJECTS) $(LDDEPS) $(RESOURCES)')
if prj.kind == "StaticLib" then
if prj.msgarchiving then
diff -up mame-0.163/3rdparty/genie/src/host/scripts.c.smpfix mame-0.163/3rdparty/genie/src/host/scripts.c
--- mame-0.163/3rdparty/genie/src/host/scripts.c.smpfix 2015-07-12 10:28:20.990519044 +0200
+++ mame-0.163/3rdparty/genie/src/host/scripts.c 2015-07-12 10:28:38.640711676 +0200
@@ -180,18 +180,18 @@ const char* builtin_scripts[] = {
/* actions/make/make_cpp.lua */
"premake.make.cpp = { }\npremake.make.override = { }\nlocal cpp = premake.make.cpp\nlocal make = premake.make\nfunction premake.make_cpp(prj)\nlocal cc = premake.gettool(prj)\nlocal platforms = premake.filterplatforms(prj.solution, cc.platforms, \"Native\")\npremake.gmake_cpp_header(prj, cc, platforms)\nfor _, platform in ipairs(platforms) do\nfor cfg in premake.eachconfig(prj, platform) do\npremake.gmake_cpp_config(prj, cfg, cc)\nend\nend\nlocal objdirs = {}\nlocal additionalobjdirs = {}\nfor _, file in ipairs(prj.files) do\nif path.iscppfile(file) then\nobjdirs[_MAKE.esc(path.getdirectory(path.trimdots(file)))] = 1\nend\nend\nfor _, custombuildtask in ipairs(prj.custombuildtask or {}) do\nfor _, buildtask in ipairs(custombuildtask or {}) do\nadditionalobjdirs[_MAKE.esc(path.getdirectory(path.getrelative(prj.location,buildtask[2])))] = 1\nend\nend\n_p('OBJDIRS := \\\\')\n_p('\\t$(OBJDIR) \\\\')\nfor dir, _ in pairs(objdirs) do\n_p('\\t$(OBJDIR)/%s \\\\', dir)\nend\nfor dir
, _ in pairs(additionalobjdirs) do\n_p"
- "('\\t%s \\\\', dir)\nend\n_p('')\n_p('RESOURCES := \\\\')\nfor _, file in ipairs(prj.files) do\nif path.isresourcefile(file) then\n_p('\\t$(OBJDIR)/%s.res \\\\', _MAKE.esc(path.getbasename(file)))\nend\nend\n_p('')\n_p('.PHONY: clean prebuild prelink')\n_p('')\nif os.is(\"MacOSX\") and prj.kind == \"WindowedApp\" then\n_p('all: $(TARGETDIR) $(OBJDIRS) prebuild prelink $(TARGET) $(dir $(TARGETDIR))PkgInfo $(dir $(TARGETDIR))Info.plist')\nelse\n_p('all: $(TARGETDIR) $(OBJDIRS) prebuild prelink $(TARGET)')\nend\n_p('\\t@:')\n_p('')\nif (prj.kind == \"StaticLib\" and prj.options.ArchiveSplit) then\n_p('define max_args')\n_p('\\t$(eval _args:=)')\n_p('\\t$(foreach obj,$3,$(eval _args+=$(obj))$(if $(word $2,$(_args)),$1$(_args)$(EOL)$(eval _args:=)))')\n_p('\\t$(if $(_args),$1$(_args))')\n_p('endef')\n_p('')\n_p('define EOL')\n_p('')\n_p('')\n_p('endef')\n_p('')\nend\n_p('$(TARGET): $(GCH) $(OBJECTS) $(LDDEPS) $(RESOURCES)')\nif prj.kind == \"StaticLib\" then\nif prj.msgarchivin
g then\n_p('\\t@echo ' .. prj.msgarchi"
- "ving)\nelse\n_p('\\t@echo Archiving %s', prj.name)\nend\nif (not prj.archivesplit_size) then\nprj.archivesplit_size=200\nend\nif (not prj.options.ArchiveSplit) then\n_p('\\t$(SILENT) $(LINKCMD) $(OBJECTS)')\nelse\n_p('\\t$(call RM,$(TARGET))')\n_p('\\t@$(call max_args,$(LINKCMD),'.. prj.archivesplit_size ..',$(OBJECTS))')\n_p('\\t$(SILENT) $(LINKCMD_NDX)')\nend\nelse\nif prj.msglinking then\n_p('\\t@echo ' .. prj.msglinking)\nelse\n_p('\\t@echo Linking %s', prj.name)\nend\n_p('\\t$(SILENT) $(LINKCMD)')\nend\n_p('\\t$(POSTBUILDCMDS)')\n_p('')\n_p('$(TARGETDIR):')\npremake.make_mkdirrule(\"$(TARGETDIR)\")\n_p('$(OBJDIRS):')\nif (not prj.solution.messageskip) or (not table.contains(prj.solution.messageskip, \"SkipCreatingMessage\")) then\n_p('\\t@echo Creating $(@)')\nend\n_p('\\t-$(call MKDIR,$@)')\n_p('')\nif os.is(\"MacOSX\") and prj.kind == \"WindowedApp\" then\n_p('$(dir $(TARGETDIR))PkgInfo:')\n_p('$(dir $(TARGETDIR))Info.plist:')\n_p('')\nend\n_p('clean:')\nif (not prj
.solution.messageskip) or (not table.c"
- "ontains(prj.solution.messageskip, \"SkipCleaningMessage\")) then\n_p('\\t@echo Cleaning %s', prj.name)\nend\n_p('ifeq (posix,$(SHELLTYPE))')\n_p('\\t$(SILENT) rm -f $(TARGET)')\n_p('\\t$(SILENT) rm -rf $(OBJDIR)')\n_p('else')\n_p('\\t$(SILENT) if exist $(subst /,\\\\\\\\,$(TARGET)) del $(subst /,\\\\\\\\,$(TARGET))')\n_p('\\t$(SILENT) if exist $(subst /,\\\\\\\\,$(OBJDIR)) rmdir /s /q $(subst /,\\\\\\\\,$(OBJDIR))')\n_p('endif')\n_p('')\n_p('prebuild:')\n_p('\\t$(PREBUILDCMDS)')\n_p('')\n_p('prelink:')\n_p('\\t$(PRELINKCMDS)')\n_p('')\ncpp.pchrules(prj)\ncpp.fileRules(prj)\ncpp.dependencyRules(prj)\nfor _, custombuildtask in ipairs(prj.custombuildtask or {}) do\nfor _, buildtask in ipairs(custombuildtask or {}) do\nlocal deps = string.format(\"%s \",path.getrelative(prj.location,buildtask[1]))\nfor _, depdata in ipairs(buildtask[3] or {}) do\ndeps = deps .. string.format(\"%s \",path.getrelative(prj.location,depdata))\nend\n_p('%s: %s'\n,path.getrelative(prj.location,bui
ldtask[2])\n, deps\n)\nfor _, cmdline "
- "in ipairs(buildtask[4] or {}) do\nlocal cmd = cmdline\nlocal num = 1\nfor _, depdata in ipairs(buildtask[3] or {}) do\ncmd = string.gsub(cmd,\"%$%(\" .. num ..\"%)\", string.format(\"%s \",path.getrelative(prj.location,depdata)))\nnum = num + 1\nend\ncmd = string.gsub(cmd, \"%$%(<%)\", \"$<\")\ncmd = string.gsub(cmd, \"%$%(@%)\", \"$@\")\n \n_p('\\t$(SILENT) %s',cmd)\nend\n_p('')\nend\nend\n_p('-include $(OBJECTS:%%.o=%%.d)')\n_p('ifneq (,$(PCH))')\n_p(' -include $(OBJDIR)/$(notdir $(PCH)).d')\n_p('endif')\nend\nfunction premake.gmake_cpp_header(prj, cc, platforms)\n_p('# %s project makefile autogenerated by GENie', premake.action.current().shortname)\n_p('ifndef config')\n_p(' config=%s', _MAKE.esc(premake.getconfigname(prj.solution.configurations[1], platforms[1], true)))\n_p('endif')\n_p('')\n_p('ifndef verbose')\n_p(' SILENT = @')\n_p('endif')\n_p('')\n_p('SHELLTYPE := msdos')\n_p('ifeq (,$(ComSpec)$(COMSPEC))')\n_p(' SHELLTYPE := posix')\n_p('endif')\n_p('ifeq (/b
in,$(findstring /bin,$(SHELL)))')\n_p("
- "' SHELLTYPE := posix')\n_p('endif')\n_p('')\n_p('ifeq (posix,$(SHELLTYPE))')\n_p(' MKDIR = $(SILENT) mkdir -p \"$(1)\"')\n_p(' COPY = $(SILENT) cp -fR \"$(1)\" \"$(2)\"')\n_p(' RM= $(SILENT) rm -f \"$(1)\"')\n_p('else')\n_p(' MKDIR = $(SILENT) mkdir \"$(subst /,\\\\\\\\,$(1))\" 2> nul || exit 0')\n_p(' COPY = $(SILENT) copy /Y \"$(subst /,\\\\\\\\,$(1))\" \"$(subst /,\\\\\\\\,$(2))\"')\n_p(' RM = $(SILENT) del /F \"$(subst /,\\\\\\\\,$(1))\" 2> nul || exit 0')\n_p('endif')\n_p('')\n_p('CC = %s', cc.cc)\n_p('CXX = %s', cc.cxx)\n_p('AR = %s', cc.ar)\n_p('')\n_p('ifndef RESCOMP')\n_p(' ifdef WINDRES')\n_p(' RESCOMP = $(WINDRES)')\n_p(' else')\n_p(' RESCOMP = windres')\n_p(' endif')\n_p('endif')\n_p('')\nend\nfunction premake.gmake_cpp_config(prj, cfg, cc)\n_p('ifeq ($(config),%s)', _MAKE.esc(cfg.shortname))\ncpp.platformtools(cfg, cc)\n_p(' ' .. (table.contains(premake.make.override,\"OBJDIR\") and \"override \" or \"\") .. 'OBJDIR = %s', _MAKE.
esc(cfg.objectsdir))\n_p(' ' .. (tabl"
- "e.contains(premake.make.override,\"TARGETDIR\") and \"override \" or \"\") .. 'TARGETDIR = %s', _MAKE.esc(cfg.buildtarget.directory))\n_p(' ' .. (table.contains(premake.make.override,\"TARGET\") and \"override \" or \"\") .. 'TARGET = $(TARGETDIR)/%s', _MAKE.esc(cfg.buildtarget.name))\n_p(' DEFINES +=%s', make.list(cc.getdefines(cfg.defines)))\n_p(' INCLUDES +=%s', make.list(cc.getincludedirs(cfg.includedirs)))\ncpp.pchconfig(cfg)\ncpp.flags(cfg, cc)\ncpp.linker(prj, cfg, cc)\n_p(' OBJECTS := \\\\')\nfor _, file in ipairs(prj.files) do\nif path.iscppfile(file) then\nif not table.icontains(cfg.excludes, file) then\n_p('\\t$(OBJDIR)/%s.o \\\\'\n, _MAKE.esc(path.trimdots(path.removeext(file)))\n)\nend\nend\nend\n_p('')\n_p(' define PREBUILDCMDS')\nif #cfg.prebuildcommands > 0 then\n_p('\\t@echo Running pre-build commands')\n_p('\\t%s', table.implode(cfg.prebuildcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p(' endef')\n_p(' define PRELINKCMDS')\nif #cfg.prelinkc
ommands > 0 then\n_p('\\t@echo Running"
- " pre-link commands')\n_p('\\t%s', table.implode(cfg.prelinkcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p(' endef')\n_p(' define POSTBUILDCMDS')\nif #cfg.postbuildcommands > 0 then\n_p('\\t@echo Running post-build commands')\n_p('\\t%s', table.implode(cfg.postbuildcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p(' endef')\nmake.settings(cfg, cc)\n_p('endif')\n_p('')\nend\nfunction cpp.platformtools(cfg, cc)\nlocal platform = cc.platforms[cfg.platform]\nif platform.cc then\n_p(' CC = %s', platform.cc)\nend\nif platform.cxx then\n_p(' CXX = %s', platform.cxx)\nend\nif platform.ar then\n_p(' AR = %s', platform.ar)\nend\nend\nfunction cpp.flags(cfg, cc)\nif cfg.pchheader and not cfg.flags.NoPCH then\n_p(' FORCE_INCLUDE += -include $(OBJDIR)/$(notdir $(PCH))')\nend\nif #cfg.forcedincludes > 0 then\n_p(' FORCE_INCLUDE += -include %s'\n,premake.esc(table.concat(cfg.forcedincludes, \";\")))\nend\n_p(' ALL_CPPFLAGS += $(CPPFLAGS) %s $(DEFINES) $(INCLUDES)',
table.concat(cc.getcppflags(cfg), \" "
- "\"))\n_p(' ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cfg.buildoptions, cfg.buildoptions_c)))\n_p(' ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cc.getcxxflags(cfg), cfg.buildoptions, cfg.buildoptions_cpp)))\n_p(' ALL_OBJCFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cc.getcxxflags(cfg), cfg.buildoptions, cfg.buildoptions_objc)))\n_p(' ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)%s',\n make.list(table.join(cc.getdefines(cfg.resdefines),\n cc.getincludedirs(cfg.resincludedirs), cfg.resoptions)))\nend\nfunction cpp.linker(prj, cfg, cc)\n_p(' ALL_LDFLAGS += $(LDFLAGS)%s', make.list(table.join(cc.getlibdirflags(cfg), cc.getldflags(cfg), cfg.linkoptions)))\n_p(' LDDEPS +=%s', make.list(_MAKE.esc(premake.getlinks(cfg, \"siblings\", \"fullpath\"))))\n_p(' LIBS
+= $(LDDEPS)%s', make.list(cc.ge"
- "tlinkflags(cfg)))\nif cfg.kind == \"StaticLib\" then\nif cfg.platform:startswith(\"Universal\") then\n_p(' LINKCMD = libtool -o $(TARGET)')\nelse\nif (not prj.options.ArchiveSplit) then\nif cc.llvm then\n_p(' LINKCMD = $(AR) rcs $(TARGET)')\nelse\n_p(' LINKCMD = $(AR) -rcs $(TARGET)')\nend\nelse\nif cc.llvm then\n_p(' LINKCMD = $(AR) qc $(TARGET)')\n_p(' LINKCMD_NDX= $(AR) cs $(TARGET)')\nelse\n_p(' LINKCMD = $(AR) -qc $(TARGET)')\n_p(' LINKCMD_NDX= $(AR) -cs $(TARGET)')\nend\nend\nend\nelse\nlocal tool = iif(cfg.language == \"C\", \"CC\", \"CXX\")\n_p(' LINKCMD = $(%s) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)', tool)\nend\nend\nfunction cpp.pchconfig(cfg)\nif not cfg.pchheader or cfg.flags.NoPCH then\nreturn\nend\nlocal pch = cfg.pchheader\nfor _, incdir in ipairs(cfg.includedirs) do\nlocal abspath = path.getabsolute(path.join(cfg.project.location, incdir))\nlocal testname = path.join(abspath, pch)\nif os.isfile(testnam
e) then\npch = path.getrelative(cfg.lo"
- "cation, testname)\nbreak\nend\nend\n_p(' PCH = %s', _MAKE.esc(pch))\n_p(' GCH = $(OBJDIR)/$(notdir $(PCH)).gch')\nend\nfunction cpp.pchrules(prj)\n_p('ifneq (,$(PCH))')\n_p('$(GCH): $(PCH)')\n_p('\\t@echo $(notdir $<)')\nlocal cmd = iif(prj.language == \"C\", \"$(CC) -x c-header $(ALL_CFLAGS)\", \"$(CXX) -x c++-header $(ALL_CXXFLAGS)\")\n_p('\\t$(SILENT) %s -MMD -MP $(DEFINES) $(INCLUDES) -o \"$@\" -MF \"$(@:%%.gch=%%.d)\" -c \"$<\"', cmd)\n_p('endif')\n_p('')\nend\nfunction cpp.fileRules(prj)\nfor _, file in ipairs(prj.files or {}) do\nif path.iscppfile(file) then\n_p('$(OBJDIR)/%s.o: %s'\n, _MAKE.esc(path.trimdots(path.removeext(file)))\n, _MAKE.esc(file)\n)\nif (path.isobjcfile(file) and prj.msgcompile_objc) then\n_p('\\t@echo ' .. prj.msgcompile_objc)\nelseif prj.msgcompile then\n_p('\\t@echo ' .. prj.msgcompile)\nelse\n_p('\\t@echo $(notdir $<)')\nend\nif (path.isobjcfile(file)) then\n_p('\\t$(SILENT) $(CXX) $(ALL_OBJCFLAGS) $(FORCE_INCLUDE) -o \"$@\"
-MF $(@:%%.o=%%.d) -c \"$<\"')\nelse\n"
- "cpp.buildcommand(path.iscfile(file) and not prj.options.ForceCPP, \"o\")\nend\nfor _, task in ipairs(prj.postcompiletasks or {}) do\n_p('\\t$(SILENT) %s', task)\n_p('')\nend\n_p('')\nelseif (path.getextension(file) == \".rc\") then\n_p('$(OBJDIR)/%s.res: %s', _MAKE.esc(path.getbasename(file)), _MAKE.esc(file))\nif prj.msgresource then\n_p('\\t@echo ' .. prj.msgresource)\nelse\n_p('\\t@echo $(notdir $<)')\nend\n_p('\\t$(SILENT) $(RESCOMP) $< -O coff -o \"$@\" $(ALL_RESFLAGS)')\n_p('')\nend\nend\nend\nfunction cpp.dependencyRules(prj)\nfor _, dependency in ipairs(prj.dependency or {}) do\nfor _, dep in ipairs(dependency or {}) do\nif (dep[3]==nil or dep[3]==false) then\n_p('$(OBJDIR)/%s.o: %s'\n, _MAKE.esc(path.trimdots(path.removeext(path.getrelative(prj.location, dep[1]))))\n, _MAKE.esc(path.getrelative(prj.location, dep[2]))\n)\nelse\n_p('%s: %s'\n, _MAKE.esc(dep[1])\n, _MAKE.esc(path.getrelative(prj.location, dep[2]))\n)\nend\n_p('')\nend\nend\nend\nfunction cpp.buildcom
mand(iscfile, objext)\nlocal flags = i"
- "if(iscfile, '$(CC) $(ALL_CFLAGS)', '$(CXX) $(ALL_CXXFLAGS)')\n_p('\\t$(SILENT) %s $(FORCE_INCLUDE) -o \"$@\" -MF $(@:%%.%s=%%.d) -c \"$<\"', flags, objext)\nend\n",
+ "('\\t%s \\\\', dir)\nend\n_p('')\n_p('RESOURCES := \\\\')\nfor _, file in ipairs(prj.files) do\nif path.isresourcefile(file) then\n_p('\\t$(OBJDIR)/%s.res \\\\', _MAKE.esc(path.getbasename(file)))\nend\nend\n_p('')\n_p('.PHONY: clean prebuild prelink')\n_p('')\nif os.is(\"MacOSX\") and prj.kind == \"WindowedApp\" then\n_p('all: $(TARGETDIR) $(OBJDIRS) prebuild prelink $(TARGET) $(dir $(TARGETDIR))PkgInfo $(dir $(TARGETDIR))Info.plist')\nelse\n_p('all: $(TARGETDIR) $(OBJDIRS) prebuild prelink $(TARGET)')\nend\n_p('\\t@:')\n_p('')\nif (prj.kind == \"StaticLib\" and prj.options.ArchiveSplit) then\n_p('define max_args')\n_p('\\t$(eval _args:=)')\n_p('\\t$(foreach obj,$3,$(eval _args+=$(obj))$(if $(word $2,$(_args)),$1$(_args)$(EOL)$(eval _args:=)))')\n_p('\\t$(if $(_args),$1$(_args))')\n_p('endef')\n_p('')\n_p('define EOL')\n_p('')\n_p('')\n_p('endef')\n_p('')\nend\n_p('$(TARGET): $(TARGETDIR) $(OBJDIRS) $(GCH) $(OBJECTS) $(LDDEPS) $(RESOURCES)')\nif prj.kind == \"StaticLib\"
then\nif prj.msgarchiving then\n_p('"
+ "\\t@echo ' .. prj.msgarchiving)\nelse\n_p('\\t@echo Archiving %s', prj.name)\nend\nif (not prj.archivesplit_size) then\nprj.archivesplit_size=200\nend\nif (not prj.options.ArchiveSplit) then\n_p('\\t$(SILENT) $(LINKCMD) $(OBJECTS)')\nelse\n_p('\\t$(call RM,$(TARGET))')\n_p('\\t@$(call max_args,$(LINKCMD),'.. prj.archivesplit_size ..',$(OBJECTS))')\n_p('\\t$(SILENT) $(LINKCMD_NDX)')\nend\nelse\nif prj.msglinking then\n_p('\\t@echo ' .. prj.msglinking)\nelse\n_p('\\t@echo Linking %s', prj.name)\nend\n_p('\\t$(SILENT) $(LINKCMD)')\nend\n_p('\\t$(POSTBUILDCMDS)')\n_p('')\n_p('$(TARGETDIR):')\npremake.make_mkdirrule(\"$(TARGETDIR)\")\n_p('$(OBJDIRS):')\nif (not prj.solution.messageskip) or (not table.contains(prj.solution.messageskip, \"SkipCreatingMessage\")) then\n_p('\\t@echo Creating $(@)')\nend\n_p('\\t-$(call MKDIR,$@)')\n_p('')\nif os.is(\"MacOSX\") and prj.kind == \"WindowedApp\" then\n_p('$(dir $(TARGETDIR))PkgInfo:')\n_p('$(dir $(TARGETDIR))Info.plist:')\n_p('')\nend\
n_p('clean:')\nif (not prj.solution.me"
+ "ssageskip) or (not table.contains(prj.solution.messageskip, \"SkipCleaningMessage\")) then\n_p('\\t@echo Cleaning %s', prj.name)\nend\n_p('ifeq (posix,$(SHELLTYPE))')\n_p('\\t$(SILENT) rm -f $(TARGET)')\n_p('\\t$(SILENT) rm -rf $(OBJDIR)')\n_p('else')\n_p('\\t$(SILENT) if exist $(subst /,\\\\\\\\,$(TARGET)) del $(subst /,\\\\\\\\,$(TARGET))')\n_p('\\t$(SILENT) if exist $(subst /,\\\\\\\\,$(OBJDIR)) rmdir /s /q $(subst /,\\\\\\\\,$(OBJDIR))')\n_p('endif')\n_p('')\n_p('prebuild:')\n_p('\\t$(PREBUILDCMDS)')\n_p('')\n_p('prelink:')\n_p('\\t$(PRELINKCMDS)')\n_p('')\ncpp.pchrules(prj)\ncpp.fileRules(prj)\ncpp.dependencyRules(prj)\nfor _, custombuildtask in ipairs(prj.custombuildtask or {}) do\nfor _, buildtask in ipairs(custombuildtask or {}) do\nlocal deps = string.format(\"%s \",path.getrelative(prj.location,buildtask[1]))\nfor _, depdata in ipairs(buildtask[3] or {}) do\ndeps = deps .. string.format(\"%s \",path.getrelative(prj.location,depdata))\nend\n_p('%s: %s'\n,path.ge
trelative(prj.location,buildtask[2])\n"
+ ", deps\n)\nfor _, cmdline in ipairs(buildtask[4] or {}) do\nlocal cmd = cmdline\nlocal num = 1\nfor _, depdata in ipairs(buildtask[3] or {}) do\ncmd = string.gsub(cmd,\"%$%(\" .. num ..\"%)\", string.format(\"%s \",path.getrelative(prj.location,depdata)))\nnum = num + 1\nend\ncmd = string.gsub(cmd, \"%$%(<%)\", \"$<\")\ncmd = string.gsub(cmd, \"%$%(@%)\", \"$@\")\n \n_p('\\t$(SILENT) %s',cmd)\nend\n_p('')\nend\nend\n_p('-include $(OBJECTS:%%.o=%%.d)')\n_p('ifneq (,$(PCH))')\n_p(' -include $(OBJDIR)/$(notdir $(PCH)).d')\n_p('endif')\nend\nfunction premake.gmake_cpp_header(prj, cc, platforms)\n_p('# %s project makefile autogenerated by GENie', premake.action.current().shortname)\n_p('ifndef config')\n_p(' config=%s', _MAKE.esc(premake.getconfigname(prj.solution.configurations[1], platforms[1], true)))\n_p('endif')\n_p('')\n_p('ifndef verbose')\n_p(' SILENT = @')\n_p('endif')\n_p('')\n_p('SHELLTYPE := msdos')\n_p('ifeq (,$(ComSpec)$(COMSPEC))')\n_p(' SHELLTYPE := posix')\
n_p('endif')\n_p('ifeq (/bin,$(findstr"
+ "ing /bin,$(SHELL)))')\n_p(' SHELLTYPE := posix')\n_p('endif')\n_p('')\n_p('ifeq (posix,$(SHELLTYPE))')\n_p(' MKDIR = $(SILENT) mkdir -p \"$(1)\"')\n_p(' COPY = $(SILENT) cp -fR \"$(1)\" \"$(2)\"')\n_p(' RM= $(SILENT) rm -f \"$(1)\"')\n_p('else')\n_p(' MKDIR = $(SILENT) mkdir \"$(subst /,\\\\\\\\,$(1))\" 2> nul || exit 0')\n_p(' COPY = $(SILENT) copy /Y \"$(subst /,\\\\\\\\,$(1))\" \"$(subst /,\\\\\\\\,$(2))\"')\n_p(' RM = $(SILENT) del /F \"$(subst /,\\\\\\\\,$(1))\" 2> nul || exit 0')\n_p('endif')\n_p('')\n_p('CC = %s', cc.cc)\n_p('CXX = %s', cc.cxx)\n_p('AR = %s', cc.ar)\n_p('')\n_p('ifndef RESCOMP')\n_p(' ifdef WINDRES')\n_p(' RESCOMP = $(WINDRES)')\n_p(' else')\n_p(' RESCOMP = windres')\n_p(' endif')\n_p('endif')\n_p('')\nend\nfunction premake.gmake_cpp_config(prj, cfg, cc)\n_p('ifeq ($(config),%s)', _MAKE.esc(cfg.shortname))\ncpp.platformtools(cfg, cc)\n_p(' ' .. (table.contains(premake.make.override,\"OBJDIR\") and \"override \" or \"\") ..
'OBJDIR = %s', _MAKE.esc(cfg.obje"
+ "ctsdir))\n_p(' ' .. (table.contains(premake.make.override,\"TARGETDIR\") and \"override \" or \"\") .. 'TARGETDIR = %s', _MAKE.esc(cfg.buildtarget.directory))\n_p(' ' .. (table.contains(premake.make.override,\"TARGET\") and \"override \" or \"\") .. 'TARGET = $(TARGETDIR)/%s', _MAKE.esc(cfg.buildtarget.name))\n_p(' DEFINES +=%s', make.list(cc.getdefines(cfg.defines)))\n_p(' INCLUDES +=%s', make.list(cc.getincludedirs(cfg.includedirs)))\ncpp.pchconfig(cfg)\ncpp.flags(cfg, cc)\ncpp.linker(prj, cfg, cc)\n_p(' OBJECTS := \\\\')\nfor _, file in ipairs(prj.files) do\nif path.iscppfile(file) then\nif not table.icontains(cfg.excludes, file) then\n_p('\\t$(OBJDIR)/%s.o \\\\'\n, _MAKE.esc(path.trimdots(path.removeext(file)))\n)\nend\nend\nend\n_p('')\n_p(' define PREBUILDCMDS')\nif #cfg.prebuildcommands > 0 then\n_p('\\t@echo Running pre-build commands')\n_p('\\t%s', table.implode(cfg.prebuildcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p(' endef')\n_p(' define PRELI
NKCMDS')\nif #cfg.prelinkcommands > 0 "
+ "then\n_p('\\t@echo Running pre-link commands')\n_p('\\t%s', table.implode(cfg.prelinkcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p(' endef')\n_p(' define POSTBUILDCMDS')\nif #cfg.postbuildcommands > 0 then\n_p('\\t@echo Running post-build commands')\n_p('\\t%s', table.implode(cfg.postbuildcommands, \"\", \"\", \"\\n\\t\"))\nend\n_p(' endef')\nmake.settings(cfg, cc)\n_p('endif')\n_p('')\nend\nfunction cpp.platformtools(cfg, cc)\nlocal platform = cc.platforms[cfg.platform]\nif platform.cc then\n_p(' CC = %s', platform.cc)\nend\nif platform.cxx then\n_p(' CXX = %s', platform.cxx)\nend\nif platform.ar then\n_p(' AR = %s', platform.ar)\nend\nend\nfunction cpp.flags(cfg, cc)\nif cfg.pchheader and not cfg.flags.NoPCH then\n_p(' FORCE_INCLUDE += -include $(OBJDIR)/$(notdir $(PCH))')\nend\nif #cfg.forcedincludes > 0 then\n_p(' FORCE_INCLUDE += -include %s'\n,premake.esc(table.concat(cfg.forcedincludes, \";\")))\nend\n_p(' ALL_CPPFLAGS += $(CPPFLAGS) %
s $(DEFINES) $(INCLUDES)', table.conca"
+ "t(cc.getcppflags(cfg), \" \"))\n_p(' ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cfg.buildoptions, cfg.buildoptions_c)))\n_p(' ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cc.getcxxflags(cfg), cfg.buildoptions, cfg.buildoptions_cpp)))\n_p(' ALL_OBJCFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH)%s', make.list(table.join(cc.getcflags(cfg), cc.getcxxflags(cfg), cfg.buildoptions, cfg.buildoptions_objc)))\n_p(' ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)%s',\n make.list(table.join(cc.getdefines(cfg.resdefines),\n cc.getincludedirs(cfg.resincludedirs), cfg.resoptions)))\nend\nfunction cpp.linker(prj, cfg, cc)\n_p(' ALL_LDFLAGS += $(LDFLAGS)%s', make.list(table.join(cc.getlibdirflags(cfg), cc.getldflags(cfg), cfg.linkoptions)))\n_p(' LDDEPS +=%s', make.list(_MAKE.esc(premake.getlinks(cfg, \"siblings\", \"
fullpath\"))))\n_p(' LIBS += $(L"
+ "DDEPS)%s', make.list(cc.getlinkflags(cfg)))\nif cfg.kind == \"StaticLib\" then\nif cfg.platform:startswith(\"Universal\") then\n_p(' LINKCMD = libtool -o $(TARGET)')\nelse\nif (not prj.options.ArchiveSplit) then\nif cc.llvm then\n_p(' LINKCMD = $(AR) rcs $(TARGET)')\nelse\n_p(' LINKCMD = $(AR) -rcs $(TARGET)')\nend\nelse\nif cc.llvm then\n_p(' LINKCMD = $(AR) qc $(TARGET)')\n_p(' LINKCMD_NDX= $(AR) cs $(TARGET)')\nelse\n_p(' LINKCMD = $(AR) -qc $(TARGET)')\n_p(' LINKCMD_NDX= $(AR) -cs $(TARGET)')\nend\nend\nend\nelse\nlocal tool = iif(cfg.language == \"C\", \"CC\", \"CXX\")\n_p(' LINKCMD = $(%s) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)', tool)\nend\nend\nfunction cpp.pchconfig(cfg)\nif not cfg.pchheader or cfg.flags.NoPCH then\nreturn\nend\nlocal pch = cfg.pchheader\nfor _, incdir in ipairs(cfg.includedirs) do\nlocal abspath = path.getabsolute(path.join(cfg.project.location, incdir))\nlocal testname = path.join(abspath,
pch)\nif os.isfile(testname) then\npch"
+ " = path.getrelative(cfg.location, testname)\nbreak\nend\nend\n_p(' PCH = %s', _MAKE.esc(pch))\n_p(' GCH = $(OBJDIR)/$(notdir $(PCH)).gch')\nend\nfunction cpp.pchrules(prj)\n_p('ifneq (,$(PCH))')\n_p('$(GCH): $(PCH)')\n_p('\\t@echo $(notdir $<)')\nlocal cmd = iif(prj.language == \"C\", \"$(CC) -x c-header $(ALL_CFLAGS)\", \"$(CXX) -x c++-header $(ALL_CXXFLAGS)\")\n_p('\\t$(SILENT) %s -MMD -MP $(DEFINES) $(INCLUDES) -o \"$@\" -MF \"$(@:%%.gch=%%.d)\" -c \"$<\"', cmd)\n_p('endif')\n_p('')\nend\nfunction cpp.fileRules(prj)\nfor _, file in ipairs(prj.files or {}) do\nif path.iscppfile(file) then\n_p('$(OBJDIR)/%s.o: %s'\n, _MAKE.esc(path.trimdots(path.removeext(file)))\n, _MAKE.esc(file)\n)\nif (path.isobjcfile(file) and prj.msgcompile_objc) then\n_p('\\t@echo ' .. prj.msgcompile_objc)\nelseif prj.msgcompile then\n_p('\\t@echo ' .. prj.msgcompile)\nelse\n_p('\\t@echo $(notdir $<)')\nend\nif (path.isobjcfile(file)) then\n_p('\\t$(SILENT) $(CXX) $(ALL_OBJCFLAGS) $
(FORCE_INCLUDE) -o \"$@\" -MF $(@:%%.o"
+ "=%%.d) -c \"$<\"')\nelse\ncpp.buildcommand(path.iscfile(file) and not prj.options.ForceCPP, \"o\")\nend\nfor _, task in ipairs(prj.postcompiletasks or {}) do\n_p('\\t$(SILENT) %s', task)\n_p('')\nend\n_p('')\nelseif (path.getextension(file) == \".rc\") then\n_p('$(OBJDIR)/%s.res: %s', _MAKE.esc(path.getbasename(file)), _MAKE.esc(file))\nif prj.msgresource then\n_p('\\t@echo ' .. prj.msgresource)\nelse\n_p('\\t@echo $(notdir $<)')\nend\n_p('\\t$(SILENT) $(RESCOMP) $< -O coff -o \"$@\" $(ALL_RESFLAGS)')\n_p('')\nend\nend\nend\nfunction cpp.dependencyRules(prj)\nfor _, dependency in ipairs(prj.dependency or {}) do\nfor _, dep in ipairs(dependency or {}) do\nif (dep[3]==nil or dep[3]==false) then\n_p('$(OBJDIR)/%s.o: %s'\n, _MAKE.esc(path.trimdots(path.removeext(path.getrelative(prj.location, dep[1]))))\n, _MAKE.esc(path.getrelative(prj.location, dep[2]))\n)\nelse\n_p('%s: %s'\n, _MAKE.esc(dep[1])\n, _MAKE.esc(path.getrelative(prj.location, dep[2]))\n)\nend\n_p('')\nend\nend\n
end\nfunction cpp.buildcommand(iscfile"
+ ", objext)\nlocal flags = iif(iscfile, '$(CC) $(ALL_CFLAGS)', '$(CXX) $(ALL_CXXFLAGS)')\n_p('\\t$(SILENT) %s $(FORCE_INCLUDE) -o \"$@\" -MF $(@:%%.%s=%%.d) -c \"$<\"', flags, objext)\nend\n",
/* actions/make/make_csharp.lua */
"local function getresourcefilename(cfg, fname)\nif path.getextension(fname) == \".resx\" then\n local name = cfg.buildtarget.basename .. \".\"\n local dir = path.getdirectory(fname)\n if dir ~= \".\" then \nname = name .. path.translate(dir, \".\") .. \".\"\nend\nreturn \"$(OBJDIR)/\" .. _MAKE.esc(name .. path.getbasename(fname)) .. \".resources\"\nelse\nreturn fname\nend\nend\nfunction premake.make_csharp(prj)\nlocal csc = premake.dotnet\nlocal cfglibs = { }\nlocal cfgpairs = { }\nlocal anycfg\nfor cfg in premake.eachconfig(prj) do\nanycfg = cfg\ncfglibs[cfg] = premake.getlinks(cfg, \"siblings\", \"fullpath\")\ncfgpairs[cfg] = { }\nfor _, fname in ipairs(cfglibs[cfg]) do\nif path.getdirectory(fname) ~= cfg.buildtarget.directory then\ncfgpairs[cfg][\"$(TARGETDIR)/\" .. _MAKE.esc(path.getname(fname))] = _MAKE.esc(fname)\nend\nend\nend\nlocal sources = {}\nlocal embedded = { }\nlocal copypairs = { }\nfor fcfg in premake.project.eachfile(prj) do\nlocal action = csc.g
etbuildaction(fcfg)\nif action == \"Co"
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- mame.spec 9 Jul 2015 21:01:40 -0000 1.111
+++ mame.spec 12 Jul 2015 08:34:41 -0000 1.112
@@ -24,6 +24,7 @@
Source100: whatsnew.zip
Patch0: %{name}-fortify.patch
Patch1: %{name}-systempa.patch
+Patch2: %{name}-genie-smpfix.patch
BuildRequires: expat-devel
BuildRequires: flac-devel
@@ -126,6 +127,7 @@
%patch0 -p1 -b .fortify
%patch1 -p1 -b .systempa
+%patch2 -p1 -b .smpfix
# Fix encoding
#for whatsnew in whatsnew_0162.txt; do
@@ -326,6 +328,7 @@
- Patched to use system PortAudio
- Added more workarouds for low memory on the builder
- Replaced wildcards with || approach
+- Fixed parallel building
* Sun Jun 07 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.162-1
- Updated to 0.162
9 years, 4 months
- 1
- 0
rpms/catalyst-kmod/devel catalyst-kmod.spec, 1.21, 1.22 sources, 1.9, 1.10
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/catalyst-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16964
Modified Files:
catalyst-kmod.spec sources
Log Message:
* Sat Jul 11 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 15.7-1
- Update to Catalyst 15.7 (internal version 15.20.1046)
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/devel/catalyst-kmod.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- catalyst-kmod.spec 11 Jul 2015 14:33:32 -0000 1.21
+++ catalyst-kmod.spec 11 Jul 2015 15:54:53 -0000 1.22
@@ -12,8 +12,9 @@
%endif
Name: catalyst-kmod
-Version: 15.20
-Release: 1%{?dist}.21
+Epoch: 1
+Version: 15.7
+Release: 1%{?dist}
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -100,6 +101,9 @@
%changelog
+* Sat Jul 11 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 15.7-1
+- Update to Catalyst 15.7 (internal version 15.20.1046)
+
* Thu Dec 18 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 14.4-1.21
- Rebuilt for kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 11 Jul 2015 14:33:32 -0000 1.9
+++ sources 11 Jul 2015 15:54:53 -0000 1.10
@@ -1 +1 @@
-81e568945c35417a60c497ce6be2ded5 catalyst-kmod-data-15.20.tar.bz2
+81e568945c35417a60c497ce6be2ded5 catalyst-kmod-data-15.7.tar.bz2
9 years, 4 months
- 1
- 0
rpms/xorg-x11-drv-catalyst/devel xorg-x11-drv-catalyst.spec, 1.11, 1.12
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16232
Modified Files:
xorg-x11-drv-catalyst.spec
Log Message:
* Sat Jul 11 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 15.7-1
- Update to Catalyst 15.7 (internal version 15.20.1046)
Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/devel/xorg-x11-drv-catalyst.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xorg-x11-drv-catalyst.spec 11 Jul 2015 14:52:38 -0000 1.11
+++ xorg-x11-drv-catalyst.spec 11 Jul 2015 15:43:51 -0000 1.12
@@ -4,7 +4,8 @@
%global __strip /bin/true
Name: xorg-x11-drv-catalyst
-Version: 15.20
+Epoch: 1
+Version: 15.7
Release: 1%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
@@ -32,23 +33,23 @@
ExclusiveArch: i386 x86_64
%endif
-Requires: catalyst-kmod >= %{version}
+Requires: catalyst-kmod >= %{?epoch}:%{version}
# Needed in all nvidia or fglrx driver packages
BuildRequires: desktop-file-utils
# It seems rpaths were introduced into the amdcccle/amdnotifyui binary in 9.12
BuildRequires: chrpath
%if 0%{?fedora} > 10 || 0%{?rhel} > 5
-Requires: %{name}-libs%{_isa} = %{version}-%{release}
+Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
%else
-Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+Requires: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
%endif
Requires(post): chkconfig
Requires(preun): chkconfig
-Provides: catalyst-kmod-common = %{version}
+Provides: catalyst-kmod-common = %{?epoch}:%{version}
Conflicts: xorg-x11-drv-nvidia
Conflicts: xorg-x11-drv-nvidia-legacy
Conflicts: xorg-x11-drv-nvidia-71xx
@@ -58,7 +59,7 @@
Conflicts: xorg-x11-drv-nvidia-newest
Conflicts: xorg-x11-drv-nvidia-custom
Conflicts: xorg-x11-drv-fglrx
-Obsoletes: catalyst-kmod < %{version}
+Obsoletes: catalyst-kmod < %{?epoch}:%{version}
# ATI auto-generated RPMs
Conflicts: ATI-fglrx
@@ -87,9 +88,9 @@
Summary: Development files for %{name}
Group: Development/Libraries
%if 0%{?fedora} > 10 || 0%{?rhel} > 5
-Requires: %{name}-libs%{_isa} = %{version}-%{release}
+Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
%else
-Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+Requires: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
%endif
%description devel
@@ -100,9 +101,9 @@
%package libs
Summary: Libraries for %{name}
Group: User Interface/X Hardware Support
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch}:%{version}-%{release}
Requires(post): ldconfig
-Provides: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+Provides: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
%description libs
This package provides the shared libraries for %{name}.
@@ -310,11 +311,6 @@
%{_bindir}/aticonfig --del-pcs-key=LDC,ReleaseVersion >/dev/null 2>&1
%{_bindir}/aticonfig --set-pcs-str=LDC,ReleaseVersion,${ReleaseVersion} >/dev/null 2>&1
fi
- Catalyst_Version=$(sed '/Catalyst_Version=S/!d; s/Catalyst_Version=S//' %{_sysconfdir}/ati/amdpcsdb.default 2>/dev/null)
- if [ -n "${Catalyst_Version}" ]; then
- %{_bindir}/aticonfig --del-pcs-key=LDC,Catalyst_Version >/dev/null 2>&1
- %{_bindir}/aticonfig --set-pcs-str=LDC,Catalyst_Version,${Catalyst_Version} >/dev/null 2>&1
- fi
fi ||:
if [ "${1}" -eq 1 ]; then
@@ -322,8 +318,15 @@
/sbin/chkconfig --add atieventsd
/sbin/service atieventsd start >/dev/null 2>&1
if [ -x /sbin/grubby ] ; then
- GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
- /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='radeon.modeset=0 rd.driver.blacklist=radeon' &>/dev/null
+ KERNELS=`/sbin/grubby --default-kernel`
+ DIST=`rpm -E %%{?dist}`
+ ARCH=`uname -m`
+ [ -z $KERNELS ] && KERNELS=`ls /boot/vmlinuz-*${DIST}.${ARCH}*`
+ for kernel in ${KERNELS} ; do
+ /sbin/grubby $ISGRUB1 \
+ --update-kernel=${kernel} \
+ --args="radeon.modeset=0 rd.driver.blacklist=radeon" &>/dev/null
+ done
fi
fi ||:
@@ -334,9 +337,14 @@
/sbin/service atieventsd stop >/dev/null 2>&1
/sbin/chkconfig --del atieventsd
if [ -x /sbin/grubby ] ; then
- # remove rdblacklist from boot params in case they installed with v10.7, which blacklisted radeon upon installation
- GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
- /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --remove-args='radeon.modeset=0 rdblacklist=radeon rd.driver.blacklist=radeon' &>/dev/null
+ DIST=`rpm -E %%{?dist}`
+ ARCH=`uname -m`
+ KERNELS=`ls /boot/vmlinuz-*${DIST}.${ARCH}*`
+ for kernel in ${KERNELS} ; do
+ /sbin/grubby $ISGRUB1 \
+ --update-kernel=${kernel} \
+ --remove-args="radeon.modeset=0 rdblacklist=radeon rd.driver.blacklist=radeon" &>/dev/null
+ done
fi
fi ||:
@@ -404,6 +412,9 @@
%changelog
+* Sat Jul 11 2015 Leigh Scott <leigh123linux(a)googlemail.com> - 15.7-1
+- Update to Catalyst 15.7 (internal version 15.20.1046)
+
* Sun Apr 27 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 14.4-1
- Update to Catalyst 14.4 (internal version 14.10.1006)
9 years, 4 months
- 1
- 0
rpms/xorg-x11-drv-catalyst/devel 00-catalyst-modulepath.conf, 1.2, 1.3 01-catalyst-videodriver.conf, 1.2, 1.3 amdcccle.desktop, 1.2, 1.3 blacklist-radeon.conf, 1.4, 1.5 catalyst-README.Fedora, 1.4, 1.5 catalyst-a-ac-aticonfig, 1.2, 1.3 catalyst-a-lid-aticonfig, 1.2, 1.3 catalyst-ati-powermode.sh, 1.2, 1.3 catalyst-atieventsd.init, 1.2, 1.3 sources, 1.7, 1.8 xorg-x11-drv-catalyst.spec, 1.10, 1.11 .cvsignore, 1.6, 1.7 dead.package, 1.3, NONE
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14859/devel
Modified Files:
.cvsignore
Added Files:
00-catalyst-modulepath.conf 01-catalyst-videodriver.conf
amdcccle.desktop blacklist-radeon.conf catalyst-README.Fedora
catalyst-a-ac-aticonfig catalyst-a-lid-aticonfig
catalyst-ati-powermode.sh catalyst-atieventsd.init sources
xorg-x11-drv-catalyst.spec
Removed Files:
dead.package
Log Message:
Give this zombie a new lease of life
Index: 00-catalyst-modulepath.conf
===================================================================
RCS file: 00-catalyst-modulepath.conf
diff -N 00-catalyst-modulepath.conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 00-catalyst-modulepath.conf 11 Jul 2015 14:52:38 -0000 1.3
@@ -0,0 +1,5 @@
+# This file is provided by xorg-x11-drv-catalyst; do not edit.
+Section "Files"
+ ModulePath "@LIBDIR@/xorg/modules/extensions/catalyst"
+ ModulePath "@LIBDIR@/xorg/modules"
+EndSection
Index: 01-catalyst-videodriver.conf
===================================================================
RCS file: 01-catalyst-videodriver.conf
diff -N 01-catalyst-videodriver.conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 01-catalyst-videodriver.conf 11 Jul 2015 14:52:38 -0000 1.3
@@ -0,0 +1,6 @@
+# This file is provided by xorg-x11-drv-catalyst; do not edit.
+Section "Device"
+ Identifier "Videocard0"
+ Driver "fglrx"
+EndSection
+
Index: amdcccle.desktop
===================================================================
RCS file: amdcccle.desktop
diff -N amdcccle.desktop
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ amdcccle.desktop 11 Jul 2015 14:52:38 -0000 1.3
@@ -0,0 +1,21 @@
+[Desktop Entry]
+Name=ATI Catalyst Control Center
+Name[de]=ATI Catalyst Control Center
+Name[es]=ATI Catalyst Control Center
+Name[fr]=ATI Catalyst Control Center
+Name[it]=ATI Catalyst Control Center
+GenericName=ATI Catalyst Control Center
+GenericName[de]=ATI Catalyst Control Center
+GenericName[es]=ATI Catalyst Control Center
+GenericName[fr]=ATI Catalyst Control Center
+GenericName[it]=ATI Catalyst Control Center
+Comment=ATI graphics adapter configuration
+Comment[de]=ATI Graphik-Adapterkonfiguration
+Comment[es]=Configuración del adaptador de los gráficos de ATI
+Comment[fr]=Configuration d'adapteur de graphiques d'ATI
+Comment[it]=Configurazione dell'adattatore dei grafici di ATI
+Icon=ccc_large
+Exec=amdcccle
+Type=Application
+Terminal=false
+Categories=Qt;System;
Index: blacklist-radeon.conf
===================================================================
RCS file: blacklist-radeon.conf
diff -N blacklist-radeon.conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ blacklist-radeon.conf 11 Jul 2015 14:52:38 -0000 1.5
@@ -0,0 +1,4 @@
+# RPM Fusion blacklist for radeon driver - you need to run as root:
+# dracut -f /boot/initramfs-$(uname -r).img $(uname -r)
+# if radeon is loaded despite this file.
+blacklist radeon
Index: catalyst-README.Fedora
===================================================================
RCS file: catalyst-README.Fedora
diff -N catalyst-README.Fedora
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ catalyst-README.Fedora 11 Jul 2015 14:52:38 -0000 1.5
@@ -0,0 +1,78 @@
+README for AMD's Linux fglrx drivers, as packaged by rpmfusion.org.
+
+
+1. After Installation
+-----------------------------
+
+The easiest way to start using the fglrx drivers after installation is to
+restart your system.
+
+The hard way depends on your hardware and your configuration:
+
+Check if you have loaded the module "radeon". If not simply log out of your
+X session to restart X -- the catalyst driver should now be loaded if there is
+a proper kernel-module installed. You can also run:
+ modprobe fglrx
+to force the fglrx kernel module to load.
+
+If you have loaded the radeon driver, log out of your X session, log in again
+and issue the command:
+ /sbin/rmmod radeon
+then end your X session once again.
+
+To check that hardware acceleration is working, issue the following command
+in a terminal:
+ glxinfo | grep "OpenGL vendor"
+That should print out
+ OpenGL vendor string: ATI Technologies Inc.
+
+Also, the command
+ glxinfo | grep direct
+should print out
+ direct rendering: Yes
+If it does, you're all set.
+
+
+2. Basic Configuration
+-----------------------------
+
+The installation scripts perform the basic configuration for you.
+When (if) you uninstall the drivers, the configuration is reset to
+use the default autodetected driver again. If you want to temporarily disable
+the fglrx drivers without uninstalling, look inside /etc/X11/xorg.conf.d and
+backup any files with a filename matching the pattern XY-catalyst-* and then
+restart your X session. To re-enable the drivers, replace these files to their
+original state.
+
+
+3. Additional configuration
+----------------------------------
+
+For configuration options (TwinView, TV-out etc) see
+/usr/share/doc/fglrx-*/index.html
+
+
+4. Kernel Module
+-----------------------------
+
+The fglrx kernel module is required for DRI. For Fedora kernels you will find
+RPMs with the name:
+ kmod-catalyst-$(uname -r)-(ati-version)-fc(releasever).(arch).rpm
+ (e.g. kmod-catalyst-2.6.27.19-170.2.35.fc10.x86_64-9.4-1.fc10.x86_64)
+at rpmfusion.org. If you use another kernel, grab the proper SRPM:
+ (e.g catalyst-kmod-9.4.fc10.src.rpm)
+from rpmfusion.org and rebuild the kernel module with the following command:
+ rpmbuild --rebuild /path/to/catalyst-srpm.src.rpm
+
+
+5. Release-specific notes
+-----------------------------
+
+Please note that this release was not written to run correctly on the Xorg
+server version included with Fedora 16 and will likely fail to operate correctly
+with most, if not all, graphic cards.
+
+During testing it was found that in some cases, kernel modesetting may need to
+disabled in order for the fglrx driver to function correctly. You may want to
+edit /etc/grub2.cfg manually and add the 'nomodeset' kernel parameter.
+
Index: catalyst-a-ac-aticonfig
===================================================================
RCS file: catalyst-a-ac-aticonfig
diff -N catalyst-a-ac-aticonfig
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ catalyst-a-ac-aticonfig 11 Jul 2015 14:52:38 -0000 1.3
@@ -0,0 +1,6 @@
+# /etc/acpi/actions/ati-powermode.sh
+# Called when the user connects ac power to us
+#
+
+event=ac_adapter
+action=/etc/acpi/actions/ati-powermode.sh
Index: catalyst-a-lid-aticonfig
===================================================================
RCS file: catalyst-a-lid-aticonfig
diff -N catalyst-a-lid-aticonfig
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ catalyst-a-lid-aticonfig 11 Jul 2015 14:52:38 -0000 1.3
@@ -0,0 +1,6 @@
+# /etc/acpi/actions/ati-powermode.sh
+# Called when the user opens/closes the laptop lid
+#
+
+event=button[ /]lid
+action=/etc/acpi/actions/ati-powermode.sh
Index: catalyst-ati-powermode.sh
===================================================================
RCS file: catalyst-ati-powermode.sh
diff -N catalyst-ati-powermode.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ catalyst-ati-powermode.sh 11 Jul 2015 14:52:38 -0000 1.3
@@ -0,0 +1,65 @@
+#!/bin/bash
+
+#
+# Control script for ACPI lid state and AC adapter state
+#
+# Copyright (c) 2006, ATI Technologies Inc. All rights reserved.
+#
+# Fedora Modifications By Michael Larabel <Michael AT Phoronix.com> on July 5, 2006
+
+getXuser() {
+ user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'`
+ if [ x"$user" = x"" ]; then
+ user=`finger| grep -m1 ":$displaynum" | awk '{print $1}'`
+ fi
+ if [ x"$user" != x"" ]; then
+ userhome=`getent passwd $user | cut -d: -f6`
+ export XAUTHORITY=$userhome/.Xauthority
+ else
+ export XAUTHORITY=""
+ fi
+}
+
+
+grep -q closed /proc/acpi/button/lid/*/state
+if [ $? = 0 ]; then
+ lid_closed=1
+ echo "Lid Closed"
+else
+ lid_closed=0
+ echo "Lid Open"
+fi
+
+grep -q off-line /proc/acpi/ac_adapter/*/state
+
+if [ $? = 0 ]; then
+ echo "On DC"
+ on_dc=1
+else
+ echo "On AC"
+ on_dc=0
+fi
+
+
+
+if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then
+ echo "Low power"
+ for x in /tmp/.X11-unix/*; do
+ displaynum=`echo $x | sed s#/tmp/.X11-unix/X##`
+ getXuser;
+ if [ x"$XAUTHORITY" != x"" ]; then
+ export DISPLAY=":$displaynum"
+ su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now"
+ fi
+ done
+else
+ echo "High power"
+ for x in /tmp/.X11-unix/*; do
+ displaynum=`echo $x | sed s#/tmp/.X11-unix/X##`
+ getXuser;
+ if [ x"$XAUTHORITY" != x"" ]; then
+ export DISPLAY=":$displaynum"
+ su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now"
+ fi
+ done
+fi
Index: catalyst-atieventsd.init
===================================================================
RCS file: catalyst-atieventsd.init
diff -N catalyst-atieventsd.init
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ catalyst-atieventsd.init 11 Jul 2015 14:52:38 -0000 1.3
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+# Startup script for the ATI External Events Daemon (atieventsd)
+#
+# chkconfig: 5 97 07
+# description: Grant or revoke access to X for the ATI External Events Daemon
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+[ -f /usr/sbin/atieventsd ] || exit 0
+
+prog=atieventsd
+opts=""
+
+PATH=/sbin:/usr/sbin:$PATH
+RETVAL=0
+
+start() {
+ echo -n $"Starting ATI External Events Daemon: "
+ XAUTHORITY=/var/run/$prog.Xauthority $prog $opts
+ RETVAL=$?
+ pid=`pidof $prog`
+ if [ -n "$pid" ] ; then
+ success $"atieventsd"
+ touch /var/lock/subsys/$prog
+ echo $pid > /var/run/$prog.pid
+ RETVAL=0
+ else
+ failure $"atieventsd"
+ RETVAL=1
+ fi
+ echo
+}
+
+stop() {
+ echo -n $"Stopping ATI External Events Daemon: "
+ killproc $prog
+ RETVAL=$?
+ if [ $RETVAL -eq 0 ]; then
+ rm -f /var/run/$prog.pid
+ rm -f /var/lock/subsys/$prog
+ fi
+ echo
+}
+
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ status)
+ status $prog
+ ;;
+ restart|reload)
+ stop
+ start
+ ;;
+ condrestart)
+ if [ -f /var/lock/subsys/$prog ]; then
+ stop
+ start
+ fi
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+ ;;
+esac
+
+exit $RETVAL
Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sources 11 Jul 2015 14:52:38 -0000 1.8
@@ -0,0 +1,2 @@
+65bb3ac5ec0201ba7940ae0db151bf3d amd-driver-installer-15.20.1046-x86.x86_64.zip
+b8f56bc55aa70cb19dd12857fdc184cc xvba-sdk-0.74-404001.tar.gz
Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: xorg-x11-drv-catalyst.spec
diff -N xorg-x11-drv-catalyst.spec
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ xorg-x11-drv-catalyst.spec 11 Jul 2015 14:52:38 -0000 1.11
@@ -0,0 +1,525 @@
+%global atilibdir %{_libdir}/catalyst
+%global amdrun amd-driver-installer-15.20.1046-x86.x86_64.run
+%global debug_package %{nil}
+
+%global __strip /bin/true
+Name: xorg-x11-drv-catalyst
+Version: 15.20
+Release: 1%{?dist}
+Summary: AMD's proprietary driver for ATI graphic cards
+Group: User Interface/X Hardware Support
+License: Redistributable, no modification permitted
+URL: http://www.ati.com/support/drivers/linux/radeon-linux.html
+Source0: http://www2.ati.com/drivers/linux/amd-driver-installer-15.20.1046-x86.x86...
+Source1: http://developer.amd.com/downloads/xvba-sdk-0.74-404001.tar.gz
+Source2: catalyst-README.Fedora
+Source3: amdcccle.desktop
+Source4: catalyst-atieventsd.init
+Source5: catalyst-ati-powermode.sh
+Source6: catalyst-a-ac-aticonfig
+Source7: catalyst-a-lid-aticonfig
+Source8: 00-catalyst-modulepath.conf
+Source9: 01-catalyst-videodriver.conf
+Source10: blacklist-radeon.conf
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%if 0%{?fedora} > 11 || 0%{?rhel} > 5
+ExclusiveArch: i686 x86_64
+%else 0%{?fedora} == 11
+ExclusiveArch: i586 x86_64
+%else
+ExclusiveArch: i386 x86_64
+%endif
+
+Requires: catalyst-kmod >= %{version}
+
+# Needed in all nvidia or fglrx driver packages
+BuildRequires: desktop-file-utils
+# It seems rpaths were introduced into the amdcccle/amdnotifyui binary in 9.12
+BuildRequires: chrpath
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
+Requires: %{name}-libs%{_isa} = %{version}-%{release}
+%else
+Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+%endif
+
+Requires(post): chkconfig
+
+Requires(preun): chkconfig
+
+Provides: catalyst-kmod-common = %{version}
+Conflicts: xorg-x11-drv-nvidia
+Conflicts: xorg-x11-drv-nvidia-legacy
+Conflicts: xorg-x11-drv-nvidia-71xx
+Conflicts: xorg-x11-drv-nvidia-96xx
+Conflicts: xorg-x11-drv-nvidia-173xx
+Conflicts: xorg-x11-drv-nvidia-beta
+Conflicts: xorg-x11-drv-nvidia-newest
+Conflicts: xorg-x11-drv-nvidia-custom
+Conflicts: xorg-x11-drv-fglrx
+Obsoletes: catalyst-kmod < %{version}
+
+# ATI auto-generated RPMs
+Conflicts: ATI-fglrx
+Conflicts: ATI-fglrx-control-panel
+Conflicts: ATI-fglrx-devel
+Conflicts: kernel-module-ATI-fglrx
+Conflicts: ATI-fglrx-IA32-libs
+
+%{?filter_setup:
+%filter_from_provides /^libGL\.so/d;
+%filter_from_requires /^libGL\.so/d;
+%filter_setup
+}
+
+%description
+This package provides the most recent proprietary AMD display driver which
+allows for hardware accelerated rendering with ATI Mobility, FireGL and
+Desktop GPUs. Some of the Desktop and Mobility GPUs supported are the
+Radeon HD 2xxx series to the Radeon HD 6xxx series.
+
+For the full product support list, please consult the release notes
+for release %{version}.
+
+
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
+Requires: %{name}-libs%{_isa} = %{version}-%{release}
+%else
+Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+%endif
+
+%description devel
+This package provides the development files of the %{name}
+package, such as OpenGL headers.
+
+
+%package libs
+Summary: Libraries for %{name}
+Group: User Interface/X Hardware Support
+Requires: %{name} = %{version}-%{release}
+Requires(post): ldconfig
+Provides: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+
+%description libs
+This package provides the shared libraries for %{name}.
+
+
+%prep
+%setup -q -c -T
+# Unzip fglrx driver
+unzip %{SOURCE0}
+# Extract fglrx driver
+sh %{amdrun} --extract fglrx
+
+# Extract XvBA devel files
+mkdir amdxvba
+pushd amdxvba
+tar xfz %{SOURCE1}
+# rename docs
+mv -f LICENSE AMD_XvBA_LICENSE
+mv -f README AMD_XvBA_README
+popd
+
+# Create tarball of kmod data for use later
+tar -cjf catalyst-kmod-data-%{version}.tar.bz2 fglrx/common/usr/share/doc/fglrx/LICENSE.TXT \
+ fglrx/common/*/modules/fglrx/ \
+ fglrx/arch/*/*/modules/fglrx/
+
+mkdir fglrxpkg
+%ifarch %{ix86}
+cp -r fglrx/common/* fglrx/xpic/* fglrx/arch/x86/* fglrxpkg/
+%endif
+
+%ifarch x86_64
+cp -r fglrx/common/* fglrx/xpic_64a/* fglrx/arch/x86_64/* fglrxpkg/
+%endif
+
+# fix doc perms & copy README.Fedora
+find fglrxpkg/usr/share/doc/fglrx -type f -exec chmod 0644 {} \;
+install -pm 0644 %{SOURCE2} ./README.Fedora
+
+# Set the correct path for gdm's Xauth file before we install it in the loop below
+sed -i -e 's|GDM_AUTH_FILE=/var/lib/gdm/$1.Xauth|GDM_AUTH_FILE=/var/gdm/$1.Xauth|' fglrxpkg/etc/ati/authatieventsd.sh
+
+%build
+# Nothing to build
+echo "Nothing to build"
+
+%install
+rm -rf $RPM_BUILD_ROOT ./__doc
+
+set +x
+for file in $(cd fglrxpkg &> /dev/null; find . -type f | grep -v -e 'amdcccle.kdelnk$' -e 'amdcccle.desktop$' -e 'lib/modules/fglrx$' -e 'fireglcontrolpanel$' -e '/usr/share/doc/fglrx/' -e 'fglrx_panel_sources.tgz$' -e 'amdcccle.*.desktop$' -e 'amdcccle.*.kdelnk' -e 'fglrx_sample_source.tgz$' -e '^./lib/modules/fglrx' -e '/usr/share/icons/ccc_' -e '^./usr/share/ati/lib')
+do
+ if [[ ! "/${file##}" = "/${file}" ]]
+ then
+ install -D -p -m 0644 fglrxpkg/${file} ./__doc/${file##./usr/share/doc/fglrx/}
+ elif [[ ! "/${file##./usr/X11R6/%{_lib}/modules/drivers}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/drivers/${file##./usr/X11R6/%{_lib}/modules/drivers}
+ elif [[ ! "/${file##./usr/X11R6/%{_lib}/modules/dri}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_prefix}/%{_lib}/dri/${file##./usr/X11R6/%{_lib}/modules/dri}
+ elif [[ ! "/${file##./usr/X11R6/%{_lib}/modules/extensions/fglrx}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/extensions/catalyst/${file##./usr/X11R6/%{_lib}/modules/extensions/fglrx}
+ elif [[ ! "/${file##./usr/X11R6/%{_lib}/modules/extensions}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/extensions/catalyst/${file##./usr/X11R6/%{_lib}/modules/extensions}
+ elif [[ ! "/${file##./usr/X11R6/%{_lib}/modules}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/${file##./usr/X11R6/%{_lib}/modules}
+%ifarch %{ix86}
+ elif [[ ! "/${file##./usr/X11R6/lib/modules/dri}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_prefix}/lib/dri/${file##./usr/X11R6/lib/modules/dri}
+%endif
+ elif [[ ! "/${file##./usr/X11R6/include/X11/extensions}" = "/${file}" ]]
+ then
+ install -D -p -m 0644 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_includedir}/fglrx/X11/extensions/${file##./usr/X11R6/include/X11/extensions}
+ elif [[ ! "/${file##./usr/%{_lib}/fglrx}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/%{_lib}/fglrx}
+ elif [[ ! "/${file##./usr/%{_lib}}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/%{_lib}/}
+ elif [[ ! "/${file##./usr/X11R6/%{_lib}/fglrx}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/X11R6/%{_lib}/fglrx}
+ elif [[ ! "/${file##./usr/X11R6/%{_lib}/}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{atilibdir}/${file##./usr/X11R6/%{_lib}/}
+ elif [[ ! "/${file##./usr/X11R6/bin/}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_bindir}/${file##./usr/X11R6/bin/}
+ elif [[ ! "/${file##./usr/bin/}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_sbindir}/${file##./usr/bin/}
+ elif [[ ! "/${file##./usr/sbin/}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_sbindir}/${file##./usr/sbin/}
+ elif [[ ! "/${file##./etc/}" = "/${file}" ]]
+ then
+ install -D -p -m 0644 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_sysconfdir}/${file##./etc/}
+ elif [[ ! "/${file##./usr/include/}" = "/${file}" ]]
+ then
+ install -D -p -m 0644 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_includedir}/fglrx/${file##./usr/include/}
+ elif [[ ! "/${file##./usr/share/man/}" = "/${file}" ]]
+ then
+ install -D -p -m 0644 fglrxpkg/${file} $RPM_BUILD_ROOT/%{_mandir}/${file##./usr/share/man/}
+ elif [[ ! "/${file##./usr/share/ati/amdcccle}" = "/${file}" ]]
+ then
+ install -D -p -m 0644 fglrxpkg/${file} $RPM_BUILD_ROOT/${file}
+ elif [[ ! "/${file##./usr/share/doc/amdcccle}" = "/${file}" ]]
+ then
+ install -D -p -m 0644 fglrxpkg/${file} $RPM_BUILD_ROOT/${file}
+ else
+ echo ${file} found -- don\'t know how to handle
+ exit 1
+ fi
+done
+set -x
+
+# Install XvBA headers
+install -D -p -m 0644 amdxvba/include/amdxvba.h $RPM_BUILD_ROOT%{_includedir}/fglrx
+
+# Remove switching scripts
+rm -f $RPM_BUILD_ROOT%{atilibdir}/switchlibGL
+rm -f $RPM_BUILD_ROOT%{atilibdir}/switchlibglx
+
+# ATI says this is a 64-bit binary, but it's not.
+rm -rf $RPM_BUILD_ROOT%{atilibdir}/libSlotMaximizerBe.so
+
+
+# Remove some 'fglrx-' prefixes
+mv $RPM_BUILD_ROOT%{atilibdir}/{fglrx-,}libGL.so.1.2
+mv $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/catalyst/{fglrx-,}libglx.so
+
+# Move XvBA data file to correct location
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib
+mv $RPM_BUILD_ROOT%{atilibdir}/libAMDXvBA.cap $RPM_BUILD_ROOT%{_prefix}/lib
+chmod 0644 $RPM_BUILD_ROOT%{_prefix}/lib/libAMDXvBA.cap
+
+# Change perms on static libs. Can't fathom how to do it nicely above.
+find $RPM_BUILD_ROOT%{atilibdir} -type f -name "*.a" -exec chmod 0644 '{}' \;
+
+# If we want versioned libs, then we need to change this and the loop above
+# to install the libs as soname.so.%{version}
+ln -s libGL.so.1.2 $RPM_BUILD_ROOT%{atilibdir}/libGL.so.1
+ln -s libGL.so.1.2 $RPM_BUILD_ROOT%{atilibdir}/libGL.so
+ln -s libfglrx_dm.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libfglrx_dm.so.1
+ln -s libfglrx_dm.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libfglrx_dm.so
+ln -s libAMDXvBA.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libAMDXvBA.so.1
+ln -s libAMDXvBA.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libAMDXvBA.so
+ln -s libXvBAW.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libXvBAW.so.1
+ln -s libXvBAW.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libXvBAW.so
+ln -s libatiuki.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libatiuki.so.1
+ln -s libatiuki.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libatiuki.so
+
+install -D -p -m 0644 fglrxpkg/usr/share/icons/ccc_large.xpm $RPM_BUILD_ROOT/%{_datadir}/icons/ccc_large.xpm
+install -D -p -m 0755 %{SOURCE4} $RPM_BUILD_ROOT%{_initrddir}/atieventsd
+install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/actions/ati-powermode.sh
+install -D -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/a-ac-aticonfig.conf
+install -D -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/a-lid-aticonfig.conf
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --vendor rpmfusion \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ %{SOURCE3}
+
+# Install static driver dependant configuration files
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+install -pm 0644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-catalyst-modulepath.conf
+touch -r %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-catalyst-modulepath.conf
+install -pm 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+
+# Fix odd perms
+find fglrxpkg -type f -perm 0555 -exec chmod 0755 '{}' \;
+find fglrxpkg -type f -perm 0744 -exec chmod 0755 '{}' \;
+chmod 644 fglrxpkg/usr/src/ati/fglrx_sample_source.tgz
+find $RPM_BUILD_ROOT -type f -name '*.a' -exec chmod 0644 '{}' \;
+chmod 644 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.xbm.example
+chmod 755 $RPM_BUILD_ROOT/%{_sysconfdir}/ati/*.sh
+
+# Remove rpaths (see comment on chrpath BR above)
+chrpath --delete $RPM_BUILD_ROOT%{_bindir}/amdcccle
+chrpath --delete $RPM_BUILD_ROOT%{_sbindir}/amdnotifyui
+
+# ld.so.conf.d file
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d
+echo "%{atilibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/catalyst-%{_lib}.conf
+
+#Blacklist radeon
+install -m 0755 -d $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
+install -p -m 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+# Update the user's version numbers in the AMD Control Center.
+if [ -f %{_sysconfdir}/amdpcsdb ];then
+ ReleaseVersion=$(sed '/ReleaseVersion=S/!d; s/ReleaseVersion=S//' %{_sysconfdir}/ati/amdpcsdb.default 2>/dev/null)
+ if [ -n "${ReleaseVersion}" ]; then
+ %{_bindir}/aticonfig --del-pcs-key=LDC,ReleaseVersion >/dev/null 2>&1
+ %{_bindir}/aticonfig --set-pcs-str=LDC,ReleaseVersion,${ReleaseVersion} >/dev/null 2>&1
+ fi
+ Catalyst_Version=$(sed '/Catalyst_Version=S/!d; s/Catalyst_Version=S//' %{_sysconfdir}/ati/amdpcsdb.default 2>/dev/null)
+ if [ -n "${Catalyst_Version}" ]; then
+ %{_bindir}/aticonfig --del-pcs-key=LDC,Catalyst_Version >/dev/null 2>&1
+ %{_bindir}/aticonfig --set-pcs-str=LDC,Catalyst_Version,${Catalyst_Version} >/dev/null 2>&1
+ fi
+fi ||:
+
+if [ "${1}" -eq 1 ]; then
+ # Add init script(s) and start it
+ /sbin/chkconfig --add atieventsd
+ /sbin/service atieventsd start >/dev/null 2>&1
+ if [ -x /sbin/grubby ] ; then
+ GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
+ /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='radeon.modeset=0 rd.driver.blacklist=radeon' &>/dev/null
+ fi
+fi ||:
+
+%post libs -p /sbin/ldconfig
+
+%preun
+if [ "${1}" -eq 0 ]; then
+ /sbin/service atieventsd stop >/dev/null 2>&1
+ /sbin/chkconfig --del atieventsd
+ if [ -x /sbin/grubby ] ; then
+ # remove rdblacklist from boot params in case they installed with v10.7, which blacklisted radeon upon installation
+ GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
+ /sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --remove-args='radeon.modeset=0 rdblacklist=radeon rd.driver.blacklist=radeon' &>/dev/null
+ fi
+fi ||:
+
+%postun libs -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc fglrxpkg/usr/share/doc/fglrx/* README.Fedora
+%dir %{_sysconfdir}/ati/
+%doc %{_docdir}/amdcccle/ccc_copyrights.txt
+%config(noreplace) %{_sysconfdir}/security/console.apps/amdcccle-su
+%config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-radeon.conf
+%config %{_sysconfdir}/X11/xorg.conf.d/*catalyst*.conf
+%{_sysconfdir}/ati/atiapfxx.blb
+%{_sysconfdir}/ati/atiapfxx
+%{_sysconfdir}/ati/atiapfxx.log
+%{_sysconfdir}/ati/logo.xbm.example
+%{_sysconfdir}/ati/logo_mask.xbm.example
+%{_sysconfdir}/ati/amdpcsdb.default
+# OpenCL files
+%dir %{_sysconfdir}/OpenCL
+%dir %{_sysconfdir}/OpenCL/vendors
+%config %{_sysconfdir}/OpenCL/vendors/amd*.icd
+# These next two files control "supported hardware" verification
+%{_sysconfdir}/ati/signature
+%{_sysconfdir}/ati/control
+%config %{_sysconfdir}/ati/authatieventsd.sh
+%config %{_sysconfdir}/acpi/actions/ati-powermode.sh
+%config(noreplace) %{_sysconfdir}/acpi/events/*aticonfig.conf
+%{_initrddir}/*
+%{_sbindir}/*
+%{_bindir}/*
+# no_multilib
+%{_libdir}/xorg/modules/drivers/fglrx_drv.so
+%{_libdir}/xorg/modules/linux/libfglrxdrm.so
+%{_libdir}/xorg/modules/extensions/catalyst/
+%{_libdir}/xorg/modules/*.so
+%{_prefix}/lib/libAMDXvBA.cap
+# /no_multilib
+%{_datadir}/applications/*amdcccle.desktop
+%{_datadir}/ati/amdcccle/*
+%{_datadir}/icons/*
+%{_mandir}/man[1-9]/atieventsd.*
+
+%files libs
+%defattr(-,root,root,-)
+%config %{_sysconfdir}/ld.so.conf.d/catalyst-%{_lib}.conf
+%dir %{atilibdir}
+%{atilibdir}/*.so*
+%{_libdir}/dri/
+
+%files devel
+%defattr(-,root,root,-)
+%doc fglrxpkg/usr/src/ati/fglrx_sample_source.tgz
+%doc amdxvba/doc/AMD_XvBA_Spec_v0_74_01_AES_2.pdf
+%doc amdxvba/AMD_XvBA_LICENSE amdxvba/AMD_XvBA_README
+%{atilibdir}/*.a
+%{_includedir}/fglrx/
+# enumerate development symlinks
+%{atilibdir}/libGL.so
+%{atilibdir}/libfglrx_dm.so
+%{atilibdir}/libAMDXvBA.so
+%{atilibdir}/libXvBAW.so
+%{atilibdir}/libatiuki.so
+
+
+%changelog
+* Sun Apr 27 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 14.4-1
+- Update to Catalyst 14.4 (internal version 14.10.1006)
+
+* Thu Oct 03 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.9-1
+- Update to Catalyst 13.9 (internal version 13.152)
+
+* Sat Aug 03 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.8-0.1.beta1
+- Update to Catalyst 13.8beta1 (internal version 13.20.5)
+
+* Wed May 29 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.6-0.1.beta
+- Update to Catalyst 13.6beta (internal version 13.101)
+
+* Sat May 11 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.4-1
+- Update to Catalyst 13.4 (internal version 12.104)
+
+* Sun Jan 20 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.1-1
+- Update to Catalyst 13.1 (internal version 9.012)
+
+* Wed Dec 05 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.11-0.3.beta11
+- Update to Catalyst 12.11 beta11 (internal version 9.01.8)
+- add blacklist file to %%{_prefix}/lib/modprobe.d/
+
+* Mon Nov 05 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.11-0.2.beta
+- update blacklist scriptlets
+
+* Sat Oct 27 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.11-0.1.beta
+- Update to Catalyst 12.11 beta (internal version 9.01)
+
+* Tue Oct 23 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.10-1
+- Update to Catalyst 12.10 release (internal version 9.002)
+
+* Mon Oct 01 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.9-0.1.beta
+- Update to Catalyst 12.9 beta (internal version 9.00)
+
+* Fri Aug 17 2012 Leigh Scott <leigh123linux(a)googlemail.com> - 12.8-1
+- Update to Catalyst 12.8 release (internal version 8.982)
+
+* Sat Jun 30 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.6-1
+- Update to Catalyst 12.6 release (internal version 8.98)
+
+* Sun Jun 24 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.6-0.1
+- Update to Catalyst 12.6 beta (internal version 8.98)
+
+* Fri Apr 27 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.4-1
+- Update to Catalyst 12.4 (internal version 8.961)
+
+* Fri Mar 30 2012 leigh scott <leigh123linux(a)googlemail.com> - 12.3-1
+- Update to Catalyst 12.3 (internal version 8.951)
+
+* Sun Feb 05 2012 Stewart Adam <s.adam at diffingo.com> - 12.1-1
+- Update to Catalyst 12.1 (internal version 8.93)
+
+* Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> - 11.11-3
+- Bump because of rawhide tagging issue
+
+* Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> - 11.11-2
+- Fix OpenCL vendor configuration file path
+
+* Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> 11.11-1
+- Update to Catalyst 11.11 (internal version 8.91.1)
+- Fix several packaging bugs (#1932, #1965)
+- Port changes from F-15 branch by Nicolas Chauvet in rfbz#1965
+- No longer use livna-config-display
+
+* Mon May 2 2011 Stewart Adam <s.adam at diffingo.com> 11.4-1
+- Update to Catalyst 11.4 (internal version 8.84.1)
+- Port changes from F-14 branch
+
+* Sun May 3 2009 Stewart Adam <s.adam at diffingo.com> - 9.4-4
+- Make the ExclusiveArch dynamic
+- Fix requirement on libs subpackage
+- Move ldconfig requirement to libs subpackage
+
+* Mon Apr 27 2009 Stewart Adam <s.adam at diffingo.com> - 9.4-3
+- Append '.conf' to the blacklist filename
+- No longer provide libs-32bit
+- Use ||: correctly in scriptlets
+
+* Thu Apr 23 2009 Stewart Adam <s.adam at diffingo.com> - 9.4-2
+- Remove udev configuration file
+- Install header files to our own directory
+- Do not provide/obsolete ati-x11-drv*
+- Remove redundant Require statements
+- Conflicts: xorg-x11-drv-nvidia custom and 71xx
+
+* Sat Apr 18 2009 Stewart Adam <s.adam at diffingo.com> - 9.4-1
+- Update to 9.4
+- Fork as xorg-x11-drv-catalyst
+
+* Sat Apr 4 2009 Stewart Adam <s.adam at diffingo.com> - 9.4-0.3.beta
+- Only disable ldconfig when driver is already enabled, always configure
+ xorg.conf even if driver is already enabled
+
+* Sat Apr 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9.4-0.2.beta
+- s/i386/i586/ in ExclusiveArch for F11
+
+* Sat Mar 28 2009 Stewart Adam <s.adam at diffingo.com> - 9.4-0.1.beta
+- Update to Catalyst 9.4 (beta)
+
+* Sat Mar 28 2009 Stewart Adam <s.adam at diffingo.com> - 9.3-1
+- Update to Catalyst 9.3
+
+* Sun Feb 22 2009 Stewart Adam <s.adam at diffingo.com> - 9.2-2
+- Make devel subpackage depend on lib subpackage of the same arch
+
+* Fri Feb 20 2009 Stewart Adam <s.adam at diffingo.com> - 9.2-1
+- Update to Catalyst 9.2
+
+* Fri Feb 20 2009 Stewart Adam <s.adam at diffingo.com> - 9.1-1
+- Use Catalyst version for Version tag instead of internal driver version
+- Update README.Fedora (add note concerning double initrd regeneration)
+
+* Sat Jan 31 2009 Stewart Adam <s.adam at diffingo.com> - 8.573-1.9.1
+- Update to Catalst 9.1
+- Sync with changes made for F-10
+- Include README.Fedora in %%doc
+- Remove fglrx_dri.so symlink hack, move fglrx_dri.so back to -libs
+- Update License tag
+
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 18 Sep 2013 14:41:38 -0000 1.6
+++ .cvsignore 11 Jul 2015 14:52:38 -0000 1.7
@@ -1,3 +1,2 @@
+amd-driver-installer-15.20.1046-x86.x86_64.zip
xvba-sdk-0.74-404001.tar.gz
-ati-driver-installer-11-11-x86.x86_64.run
-amd-catalyst-13.8-beta2-linux-x86.x86_64.zip
--- dead.package DELETED ---
9 years, 4 months
- 1
- 0
rpms/catalyst-kmod/devel catalyst-kmod.spec, 1.20, 1.21 catalyst-kmodtool-excludekernel-filterfile, 1.4, 1.5 compat_alloc-Makefile.patch, 1.3, 1.4 kernel_4.0-cr4-strn.patch, NONE, 1.1 sources, 1.8, 1.9 dead.package, 1.3, NONE
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/catalyst-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13927/devel
Added Files:
catalyst-kmod.spec catalyst-kmodtool-excludekernel-filterfile
compat_alloc-Makefile.patch kernel_4.0-cr4-strn.patch sources
Removed Files:
dead.package
Log Message:
Give this zombie a new lease of life
Index: catalyst-kmod.spec
===================================================================
RCS file: catalyst-kmod.spec
diff -N catalyst-kmod.spec
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ catalyst-kmod.spec 11 Jul 2015 14:33:32 -0000 1.21
@@ -0,0 +1,574 @@
+# buildforkernels macro hint: when you build a new version or a new release
+# that contains bugfixes or other improvements then you must disable the
+# "buildforkernels newest" macro for just that build; immediately after
+# queuing that build enable the macro again for subsequent builds; that way
+# a new akmod package will only get build when a new one is actually needed
+%global buildforkernels current
+
+# Tweak to have debuginfo - part 1/2
+%if 0%{?fedora} > 7
+%define __debug_install_post %{_builddir}/%{?buildsubdir}/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
+%{nil}
+%endif
+
+Name: catalyst-kmod
+Version: 15.20
+Release: 1%{?dist}.21
+# Taken over by kmodtool
+Summary: AMD display driver kernel module
+Group: System Environment/Kernel
+License: Redistributable, no modification permitted
+URL: http://ati.amd.com/support/drivers/linux/linux-radeon.html
+Source0: http://downloads.diffingo.com/rpmfusion/kmod-data/catalyst-kmod-data-%{ve...
+Source11: catalyst-kmodtool-excludekernel-filterfile
+Patch0: compat_alloc-Makefile.patch
+Patch1: kernel_4.0-cr4-strn.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# needed for plague to make sure it builds for i686
+ExclusiveArch: i686 x86_64
+
+# 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} }
+# kmodtool does its magic here
+%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
+
+%description
+The catalyst %{version} display driver kernel module.
+
+
+%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} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
+%setup -q -c -T -a 0
+
+# Tweak to have debuginfo - part 2/2
+%if 0%{?fedora} > 7
+cp -p %{_prefix}/lib/rpm/find-debuginfo.sh .
+sed -i -e 's|strict=true|strict=false|' find-debuginfo.sh
+%endif
+
+mkdir fglrxpkg
+%ifarch %{ix86}
+cp -r fglrx/common/* fglrx/arch/x86/* fglrxpkg/
+%endif
+
+%ifarch x86_64
+cp -r fglrx/common/* fglrx/arch/x86_64/* fglrxpkg/
+%endif
+
+# proper permissions
+find fglrxpkg/lib/modules/fglrx/build_mod/ -type f -print0 | xargs -0 chmod 0644
+
+# debuginfo fix
+#sed -i -e 's|strip -g|/bin/true|' fglrxpkg/lib/modules/fglrx/build_mod/make.sh
+
+pushd fglrxpkg
+%patch0 -p0 -b.compat_alloc
+%patch1 -p0
+popd
+
+for kernel_version in %{?kernel_versions} ; do
+ cp -a fglrxpkg/ _kmod_build_${kernel_version%%___*}
+done
+
+
+%build
+for kernel_version in %{?kernel_versions}; do
+ pushd _kmod_build_${kernel_version%%___*}/lib/modules/fglrx/build_mod/2.6.x
+ make V=1 CC="gcc" PAGE_ATTR_FIX=0 \
+ KVER="${kernel_version%%___*}" \
+ KDIR="/usr/src/kernels/${kernel_version%%___*}"
+ popd
+done
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+for kernel_version in %{?kernel_versions}; do
+ install -D -m 0755 _kmod_build_${kernel_version%%___*}/lib/modules/fglrx/build_mod/2.6.x/fglrx.ko $RPM_BUILD_ROOT%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/fglrx.ko
+done
+%{?akmod_install}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%changelog
+* Thu Dec 18 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 14.4-1.21
+- Rebuilt for kernel
+
+* Sat Dec 13 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 14.4-1.20
+- Rebuilt for kernel
+
+* Sun Nov 23 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 14.4-1.19
+- Rebuilt for kernel
+
+* Sun Nov 16 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 14.4-1.18
+- Rebuilt for kernel
+
+* Fri Oct 31 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 14.4-1.17
+- Rebuilt for kernel
+
+* Sun Oct 19 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 14.4-1.16
+- Rebuilt for kernel
+
+* Thu Oct 16 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 14.4-1.15
+- Rebuilt for kernel
+
+* Fri Oct 10 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 14.4-1.14
+- Rebuilt for kernel
+
+* Tue Oct 07 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 14.4-1.13
+- Rebuilt for kernel
+
+* Fri Sep 19 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 14.4-1.12
+- Rebuilt for kernel
+
+* Wed Sep 10 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 14.4-1.11
+- Rebuilt for kernel
+
+* Fri Aug 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 14.4-1.10
+- Rebuilt for kernel
+
+* Wed Aug 13 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 14.4-1.9
+- Rebuilt for kernel
+
+* Sat Aug 02 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 14.4-1.8
+- Rebuilt for kernel
+
+* Fri Jul 18 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 14.4-1.7
+- Rebuilt for kernel
+
+* Tue Jul 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 14.4-1.6
+- Rebuilt for kernel
+
+* Tue Jun 17 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 14.4-1.5
+- Rebuilt for kernel
+
+* Fri Jun 13 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 14.4-1.4
+- Rebuilt for kernel
+
+* Sun Jun 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 14.4-1.3
+- Rebuilt for kernel
+
+* Tue Jun 03 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 14.4-1.2
+- Rebuilt for kernel
+
+* Thu May 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 14.4-1.1
+- Rebuilt for kernel
+
+* Mon Apr 28 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 14.4-1
+- Update to Catalyst 14.4 (internal version 14.10.1006)
+
+* Fri Apr 25 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-4.1
+- Rebuilt for kernel
+
+* Thu Apr 24 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 13.9-4
+- patch for 3.14 kernel
+
+* Wed Apr 16 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-3.11
+- Rebuilt for kernel
+
+* Fri Apr 04 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-3.10
+- Rebuilt for kernel
+
+* Wed Apr 02 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-3.9
+- Rebuilt for kernel
+
+* Tue Mar 25 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-3.8
+- Rebuilt for kernel
+
+* Sun Mar 09 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-3.7
+- Rebuilt for kernel
+
+* Wed Mar 05 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-3.6
+- Rebuilt for kernel
+
+* Wed Feb 26 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-3.5
+- Rebuilt for kernel
+
+* Mon Feb 24 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-3.4
+- Rebuilt for kernel
+
+* Thu Feb 20 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-3.3
+- Rebuilt for kernel
+
+* Sat Feb 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-3.2
+- Rebuilt for kernel
+
+* Fri Feb 07 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-3.1
+- Rebuilt for kernel
+
+* Thu Jan 30 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 13.9-3
+- patch for 3.13.0 kernel
+
+* Thu Jan 30 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-2.14
+- Rebuilt for kernel
+
+* Tue Jan 28 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-2.13
+- Rebuilt for kernel
+
+* Fri Jan 17 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-2.12
+- Rebuilt for kernel
+
+* Sun Jan 12 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-2.11
+- Rebuilt for kernel
+
+* Wed Dec 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-2.10
+- Rebuilt for kernel
+
+* Fri Dec 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-2.9
+- Rebuilt for kernel
+
+* Tue Dec 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-2.8
+- Rebuilt for kernel
+
+* Thu Nov 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-2.7
+- Rebuilt for kernel
+
+* Thu Nov 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-2.6
+- Rebuilt for kernel
+
+* Mon Nov 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-2.5
+- Rebuilt for kernel
+
+* Mon Nov 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-2.4
+- Rebuilt for kernel
+
+* Tue Oct 22 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-2.3
+- Rebuilt for kernel
+
+* Mon Oct 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-2.2
+- Rebuilt for kernel
+
+* Fri Oct 11 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-2.1
+- Rebuilt for kernel
+
+* Fri Oct 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.9-1.1
+- Rebuilt for kernel
+
+* Thu Oct 03 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.9-1
+- Update to Catalyst 13.9 (internal version 13.152)
+- redo patch
+
+* Tue Oct 01 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.8-0.2.beta1.8
+- Rebuilt for kernel
+
+* Sun Sep 29 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.8-0.2.beta1.7
+- Rebuilt for kernel
+
+* Wed Sep 25 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.8-0.2.beta1.6
+- Rebuilt for kernel
+
+* Fri Aug 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.8-0.2.beta1.5
+- Rebuilt for kernel
+
+* Thu Aug 22 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.8-0.2.beta1.4
+- Rebuilt for kernel
+
+* Fri Aug 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.8-0.2.beta1.3
+- Rebuilt for kernel
+
+* Tue Aug 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.8-0.2.beta1.2
+- Rebuilt for kernel
+
+* Thu Aug 08 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.8-0.2.beta1.1
+- Rebuilt for kernel
+
+* Wed Aug 07 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.8-0.2.beta1
+- fix proc perms
+
+* Sat Aug 03 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.8-0.1.beta1
+- Update to Catalyst 13.8beta1 (internal version 13.20.5)
+
+* Tue Jul 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.6-0.1.beta.9
+- Rebuilt for kernel
+
+* Fri Jul 26 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.6-0.1.beta.8
+- Rebuilt for kernel
+
+* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.6-0.1.beta.7
+- Rebuilt for kernel
+
+* Sat Jul 06 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.6-0.1.beta.6
+- Rebuilt for kernel
+
+* Sun Jun 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.6-0.1.beta.5
+- Rebuilt for kernel
+
+* Sat Jun 29 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.6-0.1.beta.4
+- Rebuilt for kernel
+
+* Fri Jun 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.6-0.1.beta.3
+- Rebuilt for current f19 kernel
+
+* Wed Jun 12 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.6-0.1.beta.2
+- Rebuilt for current f19 kernel
+
+* Wed Jun 12 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 13.6-0.1.beta.1
+- Rebuilt for kernel
+
+* Wed May 29 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.6-0.1.beta
+- Update to Catalyst 13.6beta (internal version 13.101)
+
+* Thu May 23 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.4-3
+- drop intel_iommu patch
+
+* Wed May 22 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.4-2
+- Add patch to fix tty issue
+- Add patch to fix intel_iommu
+
+* Tue May 14 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 13.4-1
+- Update to Catalyst 13.4 (internal version 12.104)
+
+* Tue May 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 11.11-1.2
+- Rebuilt for kernel
+
+* Tue Feb 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 11.11-1.1
+- Rebuild for UsrMove
+
+* Wed Nov 16 2011 Stewart Adam <s.adam at diffingo.com> - 11.11-1
+- Update to Catalyst 11.11 (internal version 8.91.1)
+
+* Wed Nov 02 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 11.4-1.5
+- Rebuild for F-16 kernel
+
+* Tue Nov 01 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 11.4-1.4
+- Rebuild for F-16 kernel
+
+* Fri Oct 28 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 11.4-1.3
+- Rebuild for F-16 kernel
+
+* Sun Oct 23 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 11.4-1.2
+- Rebuild for F-16 kernel
+
+* Sat May 28 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 11.4-1.1
+- rebuild for F15 release kernel
+
+* Mon May 2 2011 Stewart Adam <s.adam at diffingo.com> 11.4-1
+- Update to Catalyst 11.4 (internal version 8.84.1)
+- Sync with F-14 branch
+
+* Sun Apr 24 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 11.2-1.2
+- rebuild for updated kernel
+
+* Mon Apr 04 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 11.2-1.1
+- rebuild for updated kernel
+
+* Sat Feb 19 2011 Stewart Adam <s.adam at diffingo.com> - 11.2-1
+- Update to Catalyst 11.2 (internal version 8.82.1)
+
+* Sat Feb 12 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10.12-1.1
+- rebuild for updated kernel
+
+* Sun Dec 26 2010 Stewart Adam <s.adam at diffingo.com> - 10.12-1
+- Update to Catalyst 10.12 (internal version 8.80.1)
+- Merge changes from F-13 branch
+
+* Fri Dec 17 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10.11-1.2
+- rebuild for updated kernel
+
+* Tue Dec 07 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10.11-1.1
+- rebuild for F-14 kernel
+
+* Sat Nov 20 2010 Stewart Adam <s.adam at diffingo.com> - 10.11-1
+- Update to Catalyst 10.11 (internal version 8.79.1)
+
+* Mon Oct 25 2010 Stewart Adam <s.adam at diffingo.com> - 10.10-1
+- Update to Catalyst 10.10 (internal version 8.78.3)
+
+* Thu Oct 21 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10.9-1.2
+- rebuild for new kernel
+
+* Sun Sep 19 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10.9-1.1
+- rebuild for new kernel
+
+* Sat Sep 18 2010 Stewart Adam <s.adam at diffingo.com> - 10.9-1
+- Update to Catalyst 10.9 (internal version 8.77.1)
+
+* Sat Sep 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10.8-1.2
+- rebuild for new kernel
+
+* Fri Sep 10 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10.8-1.1
+- rebuild for new kernel
+
+* Mon Aug 30 2010 Stewart Adam <s.adam at diffingo.com> - 10.8-1
+- Update to 10.8 (internal version 8.76.2)
+
+* Sat Aug 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10.7-1.4
+- rebuild for new kernel
+
+* Fri Aug 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10.7-1.3
+- rebuild for new kernel
+
+* Wed Aug 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10.7-1.2
+- rebuild for new kernel
+
+* Sun Aug 08 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10.7-1.1
+- rebuild for new kernel
+
+* Wed Jul 28 2010 Stewart Adam <s.adam at diffingo.com> - 10.7-1
+- Update to Catalyst 10.7 (internal version 8.75.3)
+- Synchronize changes with those in F-12 branch
+
+* Tue Jul 27 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10.5-1.4
+- rebuild for new kernel
+
+* Wed Jul 07 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10.5-1.3
+- rebuild for new kernel
+
+* Fri Jun 18 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10.5-1.2
+- rebuild for new kernel
+
+* Tue Jun 1 2010 Stewart Adam <s.adam at diffingo.com> - 10.5-1.1
+- Rebuild with correct sources
+
+* Thu May 27 2010 Stewart Adam <s.adam at diffingo.com> - 10.5-1
+- Update to Catalyst 10.5 (internal version 8.73.2)
+
+* Sat May 1 2010 Stewart Adam <s.adam at diffingo.com> - 10.4-1
+- Update to Catalyst 10.4 (internal version 8.72.3)
+
+* Thu Feb 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10.1-1.3
+- rebuild for new kernel
+
+* Mon Feb 08 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10.1-1.2
+- rebuild for new kernel
+
+* Thu Feb 04 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10.1-1.1
+- rebuild for new kernel
+
+* Wed Jan 27 2010 Stewart Adam <s.adam at diffingo.com> - 10.1-1
+- Update to Catalyst 10.1 (internal version 8.69)
+
+* Fri Jan 22 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9.12-1.1
+- rebuild for new kernel
+
+* Mon Dec 28 2009 Stewart Adam <s.adam at diffingo.com> - 9.12-1
+- Update to Catalyst 9.12 (internal version 8.68.1)
+
+* Sat Dec 26 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9.10-1.4
+- rebuild for new kernel
+
+* Sun Dec 06 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9.10-1.3
+- rebuild for new kernel
+
+* Sun Nov 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9.10-1.2
+- rebuild for new kernels
+
+* Thu Nov 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9.10-1.1
+- rebuild for new kernels
+
+* Sat Oct 24 2009 Stewart Adam <s.adam at diffingo.com> - 9.10-1
+- Update to Catalyst 9.10 (internal version 8.66.1)
+
+* Tue Oct 20 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9.9-1.2
+- rebuild for new kernels
+
+* Wed Sep 30 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9.9-1.1
+- rebuild for new kernels
+
+* Fri Sep 11 2009 Stewart Adam <s.adam at diffingo.com> - 9.9-1
+- Update to Catalyst 9.9 (internal version 8.65.4)
+
+* Tue Sep 01 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9.8-1.4
+- rebuild for new kernels
+
+* Thu Aug 27 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9.8-1.3
+- rebuild for new kernels
+
+* Sun Aug 23 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9.8-1.2
+- rebuild for new kernels
+
+* Sat Aug 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9.8-1.1
+- rebuild for new kernels
+
+* Wed Aug 19 2009 Stewart Adam <s.adam at diffingo.com> - 9.8-1
+- Update to Catalyst 9.8 (internal version 8.64.3)
+
+* Sat Aug 15 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9.5-1.8
+- rebuild for new kernels
+
+* Tue Aug 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9.5-1.7
+- rebuild for new kernels
+
+* Tue Jul 14 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9.5-1.6
+- rebuild for new kernels
+
+* Mon Jun 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9.5-1.5
+- rebuild for new kernels
+
+* Fri Jun 19 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9.5-1.4
+- rebuild for new kernels
+
+* Wed May 27 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9.5-1.3
+- rebuild for new kernels
+
+* Sun May 24 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9.5-1.2
+- rebuild for new kernels
+
+* Thu May 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9.5-1.1
+- rebuild for new kernels
+
+* Thu May 21 2009 kwizart < kwizart at gmail.com > - 9.5-1
+- Update to 9.5 (internal version 8.612)
+
+* Thu May 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9.4-2.2
+- rebuild for new kernels
+
+* Wed May 13 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9.4-2.1
+- rebuild for new kernels
+
+* Wed May 6 2009 Stewart Adam <s.adam at diffingo.com> - 9.4-2
+- Remove Makefile patch and set KDIR variable instead (thanks to kwizart)
+
+* Sat Apr 18 2009 Stewart Adam <s.adam at diffingo.com> - 9.4-1
+- Update to 9.4
+- Fork as catalyst-kmod
+
+* Sun Apr 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9.4-0.2.beta.1
+- rebuild for new kernels
+
+* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 9.4-0.2.beta
+- rebuild for new F11 features
+
+* Sat Mar 28 2009 Stewart Adam <s.adam at diffingo.com> - 9.4-0.1.beta
+- Update to Catalyst 9.4 (beta)
+
+* Sat Mar 28 2009 Stewart Adam <s.adam at diffingo.com> - 9.3-1
+- Update to Catalyst 9.3
+
+* Sat Feb 21 2009 Stewart Adam <s.adam at diffingo.com> - 9.2-2
+- Fix flush_tlb_page modprobe errors on x86_64
+
+* Fri Feb 20 2009 Stewart Adam <s.adam at diffingo.com> - 9.2-1
+- Update to Catalyst 9.2
+- Use Catalyst version for Version tag instead of internal driver version
+
+* Sun Feb 15 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 8.573-1.9.1.2
+- rebuild for latest Fedora kernel;
+
+* Sun Feb 01 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 8.573-1.9.1.1
+- rebuild for latest Fedora kernel;
+
+* Sat Jan 31 2009 Stewart Adam <s.adam at diffingo.com> - 8.573-1.9.1
+- Update to Catalyst 9.1
+
+* Sun Jan 25 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 8.561-2.8.12.6
+- rebuild for latest Fedora kernel;
+
+* Sun Jan 18 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 8.561-2.8.12.5
+- rebuild for latest Fedora kernel;
+
+* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 8.561-2.8.12.4
+- rebuild for latest Fedora kernel;
+
+* Sun Jan 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 8.561-2.8.12.3
+- rebuild for latest Fedora kernel;
+
Index: catalyst-kmodtool-excludekernel-filterfile
===================================================================
RCS file: catalyst-kmodtool-excludekernel-filterfile
diff -N catalyst-kmodtool-excludekernel-filterfile
compat_alloc-Makefile.patch:
Makefile | 1 +
1 file changed, 1 insertion(+)
Index: compat_alloc-Makefile.patch
===================================================================
RCS file: compat_alloc-Makefile.patch
diff -N compat_alloc-Makefile.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ compat_alloc-Makefile.patch 11 Jul 2015 14:33:32 -0000 1.4
@@ -0,0 +1,10 @@
+--- lib/modules/fglrx/build_mod/2.6.x/Makefile.compat_alloc 2010-10-25 19:14:43.157401050 -0400
++++ lib/modules/fglrx/build_mod/2.6.x/Makefile 2010-10-25 19:14:54.586401063 -0400
+@@ -68,6 +68,7 @@
+ -DFGL_GART_RESERVED_SLOT \
+ -DFGL_LINUX253P1_VMA_API \
+ -DPAGE_ATTR_FIX=$(PAGE_ATTR_FIX) \
++ -DCOMPAT_ALLOC_USER_SPACE=$(COMPAT_ALLOC_USER_SPACE) \
+
+ ifeq ($(KERNELRELEASE),)
+ # on first call from remote location we get into this path
kernel_4.0-cr4-strn.patch:
firegl_public.c | 18 ++++++++++++++++++
kcl_str.c | 4 ++++
2 files changed, 22 insertions(+)
--- NEW FILE kernel_4.0-cr4-strn.patch ---
--- lib/modules/fglrx/build_mod/firegl_public.c
+++ lib/modules/fglrx/build_mod/firegl_public.c
@@ -4468,8 +4468,13 @@
if (cpu_has_pge)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
cr4 = read_cr4();
write_cr4(cr4 & ~X86_CR4_PGE);
+#else
+ cr4 = __read_cr4();
+ __write_cr4(cr4 & ~X86_CR4_PGE);
+#endif
}
__flush_tlb();
@@ -4482,7 +4487,11 @@
write_cr0(cr0 & 0xbfffffff);
if (cpu_has_pge)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
write_cr4(cr4);
+#else
+ __write_cr4(cr4);
+#endif
}
local_irq_restore(flags);
@@ -4509,8 +4518,13 @@
if (cpu_has_pge)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
cr4 = read_cr4();
write_cr4(cr4 & ~X86_CR4_PGE);
+#else
+ cr4 = __read_cr4();
+ __write_cr4(cr4 & ~X86_CR4_PGE);
+#endif
}
__flush_tlb();
@@ -4522,7 +4536,11 @@
write_cr0(cr0 & 0xbfffffff);
if (cpu_has_pge)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
write_cr4(cr4);
+#else
+ __write_cr4(cr4);
+#endif
}
local_irq_restore(flags);
--- lib/modules/fglrx/build_mod/kcl_str.c
+++ lib/modules/fglrx/build_mod/kcl_str.c
@@ -169,7 +169,11 @@
const char* s2,
KCL_TYPE_SizeSigned count)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
return strnicmp(s1, s2, count);
+#else
+ return strncasecmp(s1, s2, count);
+#endif
}
/** \brief Locate character in string
Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sources 11 Jul 2015 14:33:32 -0000 1.9
@@ -0,0 +1 @@
+81e568945c35417a60c497ce6be2ded5 catalyst-kmod-data-15.20.tar.bz2
--- dead.package DELETED ---
9 years, 4 months
- 1
- 0
rpms/vdr-skindesigner/devel .cvsignore, 1.39, 1.40 sources, 1.40, 1.41 vdr-skindesigner.spec, 1.43, 1.44
by Martin Gansser
Author: martinkg
Update of /cvs/free/rpms/vdr-skindesigner/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6128/devel
Modified Files:
.cvsignore sources vdr-skindesigner.spec
Log Message:
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vdr-skindesigner/devel/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore 15 Jun 2015 18:15:20 -0000 1.39
+++ .cvsignore 10 Jul 2015 16:46:57 -0000 1.40
@@ -1 +1 @@
-vdr-plugin-skindesigner-0.5.3.tar.bz2
+vdr-plugin-skindesigner-0.6.1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vdr-skindesigner/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources 15 Jun 2015 18:15:20 -0000 1.40
+++ sources 10 Jul 2015 16:46:57 -0000 1.41
@@ -1 +1 @@
-88351cc2a1a3b1a9ebe77a311f708056 vdr-plugin-skindesigner-0.5.3.tar.bz2
+bd970797a232ef7628f8b687a427e513 vdr-plugin-skindesigner-0.6.1.tar.bz2
Index: vdr-skindesigner.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-skindesigner/devel/vdr-skindesigner.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- vdr-skindesigner.spec 15 Jun 2015 18:15:20 -0000 1.43
+++ vdr-skindesigner.spec 10 Jul 2015 16:46:57 -0000 1.44
@@ -1,5 +1,5 @@
Name: vdr-skindesigner
-Version: 0.5.3
+Version: 0.6.1
Release: 1%{?dist}
Summary: A VDR skinning engine that displays XML based Skins
@@ -113,6 +113,9 @@
%{_includedir}/libskindesignerapi/
%changelog
+* Fri Jul 10 2015 Martin Gansser <martinkg(a)fedoraproject.org> - 0.6.1-1
+- Update to 0.6.1
+
* Mon Jun 15 2015 Martin Gansser <martinkg(a)fedoraproject.org> - 0.5.3-1
- Update to 0.5.3
9 years, 4 months
- 1
- 0
rpms/mame/devel mame.spec,1.110,1.111
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5725
Modified Files:
mame.spec
Log Message:
Replaced wildcards with || approach
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- mame.spec 9 Jul 2015 05:34:47 -0000 1.110
+++ mame.spec 9 Jul 2015 21:01:40 -0000 1.111
@@ -228,12 +228,15 @@
# install files
install -pm 644 %{name}.ini $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
%if %{with ldplayer}
-install -pm 755 ldplayer* $RPM_BUILD_ROOT%{_bindir}/ldplayer
+install -pm 755 ldplayer $RPM_BUILD_ROOT%{_bindir}/ldplayer || \
+install -pm 755 ldplayer64 $RPM_BUILD_ROOT%{_bindir}/ldplayer
%endif
%if %{with debug}
-install -pm 755 %{name}*d $RPM_BUILD_ROOT%{_bindir}/%{name}
+install -pm 755 %{name}d $RPM_BUILD_ROOT%{_bindir}/%{name} || \
+install -pm 755 %{name}64d $RPM_BUILD_ROOT%{_bindir}/%{name}
%else
-install -pm 755 %{name}* $RPM_BUILD_ROOT%{_bindir}/%{name}
+install -pm 755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name} || \
+install -pm 755 %{name}64 $RPM_BUILD_ROOT%{_bindir}/%{name}
%endif
install -pm 755 castool chdman floptool imgtool jedutil ldresample ldverify \
nltool pngcmp romcmp testkeys unidasm $RPM_BUILD_ROOT%{_bindir}
@@ -322,7 +325,7 @@
- Dropped upstreamed patches
- Patched to use system PortAudio
- Added more workarouds for low memory on the builder
-- Corrected the wildcards used in %%install section
+- Replaced wildcards with || approach
* Sun Jun 07 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.162-1
- Updated to 0.162
9 years, 4 months
- 1
- 0
rpms/mame/devel mame.spec,1.109,1.110
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25084
Modified Files:
mame.spec
Log Message:
Corrected the wildcards used in %%install section
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- mame.spec 8 Jul 2015 20:38:42 -0000 1.109
+++ mame.spec 9 Jul 2015 05:34:47 -0000 1.110
@@ -228,12 +228,12 @@
# install files
install -pm 644 %{name}.ini $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
%if %{with ldplayer}
-install -pm 755 ldplayer?? $RPM_BUILD_ROOT%{_bindir}/ldplayer
+install -pm 755 ldplayer* $RPM_BUILD_ROOT%{_bindir}/ldplayer
%endif
%if %{with debug}
-install -pm 755 %{name}??d $RPM_BUILD_ROOT%{_bindir}/%{name}
+install -pm 755 %{name}*d $RPM_BUILD_ROOT%{_bindir}/%{name}
%else
-install -pm 755 %{name}?? $RPM_BUILD_ROOT%{_bindir}/%{name}
+install -pm 755 %{name}* $RPM_BUILD_ROOT%{_bindir}/%{name}
%endif
install -pm 755 castool chdman floptool imgtool jedutil ldresample ldverify \
nltool pngcmp romcmp testkeys unidasm $RPM_BUILD_ROOT%{_bindir}
@@ -322,6 +322,7 @@
- Dropped upstreamed patches
- Patched to use system PortAudio
- Added more workarouds for low memory on the builder
+- Corrected the wildcards used in %%install section
* Sun Jun 07 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.162-1
- Updated to 0.162
9 years, 4 months
- 1
- 0
rpms/mame/devel mame.spec,1.108,1.109
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1070
Modified Files:
mame.spec
Log Message:
Added more workarouds for low memory on the builder
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- mame.spec 8 Jul 2015 06:06:51 -0000 1.108
+++ mame.spec 8 Jul 2015 20:38:42 -0000 1.109
@@ -188,18 +188,22 @@
USE_SYSTEM_LIB_PORTAUDIO=1 SDL_INI_PATH=%{_sysconfdir}/%{name};"
%endif
+%if %{with lowmem}
+MAME_FLAGS="$MAME_FLAGS LDOPTS=-Wl,--no-keep-memory,--reduce-memory-overheads"
+%endif
+
#only use assembly on supported architectures
%ifnarch %{ix86} x86_64 ppc ppc64
MAME_FLAGS="$MAME_FLAGS NOASM=1"
%endif
%if %{with ldplayer}
-make $MAME_FLAGS TARGET=ldplayer OPT_FLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} $MAME_FLAGS TARGET=ldplayer OPT_FLAGS="$RPM_OPT_FLAGS"
%endif
%if %{with debug}
-make $MAME_FLAGS DEBUG=1 TOOLS=1 OPT_FLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} $MAME_FLAGS DEBUG=1 TOOLS=1 OPT_FLAGS="$RPM_OPT_FLAGS"
%else
-make $MAME_FLAGS TOOLS=1 OPT_FLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} $MAME_FLAGS TOOLS=1 OPT_FLAGS="$RPM_OPT_FLAGS"
%endif
@@ -317,7 +321,7 @@
- Cleaned up the spec file further
- Dropped upstreamed patches
- Patched to use system PortAudio
-- Dropped %%{?_smp_mflags} in an attempt not to run out of memory when linking
+- Added more workarouds for low memory on the builder
* Sun Jun 07 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.162-1
- Updated to 0.162
9 years, 4 months
- 1
- 0
rpms/mame/devel mame.spec,1.107,1.108
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19651
Modified Files:
mame.spec
Log Message:
Dropped %%{?_smp_mflags} in an attempt not to run out of memory when linking
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- mame.spec 5 Jul 2015 20:04:17 -0000 1.107
+++ mame.spec 8 Jul 2015 06:06:51 -0000 1.108
@@ -194,12 +194,12 @@
%endif
%if %{with ldplayer}
-make %{?_smp_mflags} $MAME_FLAGS TARGET=ldplayer OPT_FLAGS="$RPM_OPT_FLAGS"
+make $MAME_FLAGS TARGET=ldplayer OPT_FLAGS="$RPM_OPT_FLAGS"
%endif
%if %{with debug}
-make %{?_smp_mflags} $MAME_FLAGS DEBUG=1 TOOLS=1 OPT_FLAGS="$RPM_OPT_FLAGS"
+make $MAME_FLAGS DEBUG=1 TOOLS=1 OPT_FLAGS="$RPM_OPT_FLAGS"
%else
-make %{?_smp_mflags} $MAME_FLAGS TOOLS=1 OPT_FLAGS="$RPM_OPT_FLAGS"
+make $MAME_FLAGS TOOLS=1 OPT_FLAGS="$RPM_OPT_FLAGS"
%endif
@@ -317,6 +317,7 @@
- Cleaned up the spec file further
- Dropped upstreamed patches
- Patched to use system PortAudio
+- Dropped %%{?_smp_mflags} in an attempt not to run out of memory when linking
* Sun Jun 07 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.162-1
- Updated to 0.162
9 years, 4 months
- 1
- 0