Check for python3 rather than python2

With python2 being deprecated, it makes sense to switch gpp.py to be
python3 compatable and the build system to look for python3 rather
than python2.

Author: bryteise

configure.ac

@@ -77,7 +77,7 @@ AC_HEADER_STDC
 AC_SYS_LARGEFILE
 AC_CHECK_LIB([m], [sin])
 AC_CHECK_FUNCS([log2f])
-AC_CHECK_PROGS([PYTHON2], [python2 python])
+AC_CHECK_PROGS([PYTHON3], [python3 python])
 
 LIBVA_PACKAGE_VERSION=libva_package_version
 AC_SUBST(LIBVA_PACKAGE_VERSION)

src/shaders/gpp.py

@@ -64,7 +64,7 @@ def __parse_init(self, init):
 		self.param_init = []
 		for ini in inits:
 			try:
-				val = eval(ini)
+				val = int(eval(ini))
 				self.param_init.append(val)
 			except:
 				raise Exception(self.__errmsg('non an exp: %s'%ini))
@@ -80,7 +80,7 @@ def __parse_cond(self, cond):
 				self.param_op = cond[0]
 				limit = cond[1:]
 			try:
-				self.param_limit = eval(limit)
+				self.param_limit = int(eval(limit))
 			except:
 				raise Exception(self.__errmsg('non an exp: %s'%limit))
 		else:
@@ -172,13 +172,13 @@ def do_writeblock(block, curs):
 if __name__ == '__main__':
 	argc = len(sys.argv)
 	if argc == 1:
-		print >>sys.stderr, 'no input file'
+		print('no input file')
 		sys.exit(0)
 
 	try:
 		infile = open(sys.argv[1], 'r')
 	except IOError:
-		print >>sys.stderr, 'can not open %s' % sys.argv[1]
+		print('can not open %s' % sys.argv[1])
 		sys.exit(1)
 
 	if argc == 2:
@@ -187,7 +187,7 @@ def do_writeblock(block, curs):
 		try:
 			outfile = open(sys.argv[2], 'w')
 		except IOError:
-			print >>sys.stderr, 'can not write to %s' % sys.argv[2]
+			print('can not write to %s' % sys.argv[2])
 			sys.exit(1)
 
 	lines = readlines(infile)

src/shaders/h264/mc/Makefile.am

@@ -189,12 +189,12 @@ if HAVE_GEN4ASM
 
 $(INTEL_MC_GEN5_ASM): $(INTEL_MC_ASM) $(INTEL_MC_INC) $(INTEL_ILDB_ASM)
 	$(AM_V_GEN)cpp -DDEV_ILK -DBOOTSTRAP -I $(srcdir)/../ildb/ $(srcdir)/AllAVC.asm > _mc0.$@	&& \
-	$(PYTHON2) $(top_srcdir)/src/shaders/gpp.py _mc0.$@ $@			&& \
+	$(PYTHON3) $(top_srcdir)/src/shaders/gpp.py _mc0.$@ $@			&& \
 	$(GEN4ASM) -l $(srcdir)/list -a -e tmp.$(INTEL_MC_EXPORT_GEN5) -g 5 $@	   \
 		-o /dev/null						&& \
 	mv tmp.$(INTEL_MC_EXPORT_GEN5) $(INTEL_MC_EXPORT_GEN5)		&& \
 	cpp -DDEV_ILK -I $(srcdir)/../ildb/ $(srcdir)/AllAVC.asm > _mc1.$@	&& \
-	$(PYTHON2) $(top_srcdir)/src/shaders/gpp.py _mc1.$@ $@			&& \
+	$(PYTHON3) $(top_srcdir)/src/shaders/gpp.py _mc1.$@ $@			&& \
 	rm _mc0.$@ _mc1.$@
 
 $(INTEL_MC_G4B_GEN5): $(INTEL_MC_GEN5_ASM)

src/shaders/post_processing/gen5_6/Makefile.am

@@ -200,15 +200,15 @@ if HAVE_GEN4ASM
 $(INTEL_PP_GEN5_ASM): $(INTEL_PP_ASM)
 .asm.g5s:
 	$(AM_V_GEN)cpp -D DEV_ILK -I $(srcdir)/Common/ -I $(srcdir)/Core_Kernels $< > _pp0.$@; \
-	$(PYTHON2) $(top_srcdir)/src/shaders/gpp.py _pp0.$@ $@; \
+	$(PYTHON3) $(top_srcdir)/src/shaders/gpp.py _pp0.$@ $@; \
 	rm _pp0.$@
 .g5s.g4b.gen5:
 	$(AM_V_GEN)$(GEN4ASM) -a -o $@ -g 5 $<
 
 $(INTEL_PP_GEN6_ASM): $(INTEL_PP_ASM)
 .asm.g6s:
 	$(AM_V_GEN)cpp -D GT -I $(srcdir)/Common/ -I $(srcdir)/Core_Kernels $< > _pp0.$@; \
-	$(PYTHON2) $(top_srcdir)/src/shaders/gpp.py _pp0.$@ $@; \
+	$(PYTHON3) $(top_srcdir)/src/shaders/gpp.py _pp0.$@ $@; \
 	rm _pp0.$@
 .g6s.g6b:
 	$(AM_V_GEN)$(GEN4ASM) -a -o $@ -g 6 $<

src/shaders/post_processing/gen7/Makefile.am

@@ -86,7 +86,7 @@ if HAVE_GEN4ASM
 $(INTEL_PP_GEN7_ASM): $(INTEL_PP_ASM) $(INTEL_PP_G4A)
 .asm.g7s:
 	$(AM_V_GEN)cpp $< > _pp0.$@;		\
-	$(PYTHON2) $(top_srcdir)/src/shaders/gpp.py _pp0.$@ $@;	\
+	$(PYTHON3) $(top_srcdir)/src/shaders/gpp.py _pp0.$@ $@;	\
 	rm _pp0.$@
 .g7s.g7b:
 	$(AM_V_GEN)$(GEN4ASM) -a -o $@ -g 7 $<

src/shaders/post_processing/gen8/Makefile.am

@@ -65,7 +65,7 @@ if HAVE_GEN4ASM
 $(INTEL_PP_GEN8_ASM): $(INTEL_PP_ASM) $(INTEL_PP_G8A)
 .asm.g8s:
 	$(AM_V_GEN)cpp $< > _pp0.$@;		\
-	$(PYTHON2) $(top_srcdir)/src/shaders/gpp.py _pp0.$@ $@;	\
+	$(PYTHON3) $(top_srcdir)/src/shaders/gpp.py _pp0.$@ $@;	\
 	rm _pp0.$@
 .g8s.g8b:
 	$(AM_V_GEN)$(GEN4ASM) -a -o $@ -g 8 $<

src/shaders/post_processing/gen9/Makefile.am

@@ -66,7 +66,7 @@ if HAVE_GEN4ASM
 $(INTEL_PP_GEN9_ASM): $(INTEL_PP_ASM) $(INTEL_PP_G9A)
 .asm.g9s:
 	$(AM_V_GEN)cpp $< > _pp0.$@;		\
-	$(PYTHON2) $(top_srcdir)/src/shaders/gpp.py _pp0.$@ $@;	\
+	$(PYTHON3) $(top_srcdir)/src/shaders/gpp.py _pp0.$@ $@;	\
 	rm _pp0.$@
 .g9s.g9b:
 	$(AM_V_GEN)$(GEN4ASM) -a -o $@ -g 9 $<